Updated utils, updated license

master
nathan 2014-12-18 20:27:10 +01:00
parent 334badc510
commit ad1e83180e
2 changed files with 4 additions and 45 deletions

46
LICENSE
View File

@ -1,50 +1,8 @@
- Dorkbox InputConsole - Apache 2.0 License
- Dorkbox PE Parser - Apache 2.0 License
https://github.com/dorkbox
Copyright 2010, dorkbox, llc
- Apache Harmony - Apache 2.0 License
http://harmony.apache.org
Copyright 2003-2010, The Apache Software Foundation
Copyright 2012, dorkbox, llc
- Dorkbox Utils - Apache 2.0 License
https://github.com/dorkbox
Copyright 2010, dorkbox, llc
- FastObjectPool - Apache 2.0 License
http://ashkrit.blogspot.com/2013/05/lock-less-java-object-pool.html
https://github.com/ashkrit/blog/tree/master/FastObjectPool
Copyright 2013, Ashkrit
- hawtjni - Apache 2.0 License
https://github.com/fusesource/hawtjni
Copyright Hiram Chirino
- Jansi - Apache 2.0 License
https://github.com/fusesource/jansi
Copyright Hiram Chirino
- JLine2 - BSD License
https://github.com/jline/jline2
Copyright 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
Copyright 2002-2012, the original author or authors
- JNA - Apache 2.0 License
https://github.com/twall/jna
Copyright 2011, Timothy Wall
- Kryo - BSD License
https://github.com/EsotericSoftware/kryo
Copyright 2008, Nathan Sweet
- SLF4J - MIT License
http://www.slf4j.org/
Copyright 2004-2008, QOS.ch

View File

@ -11,7 +11,8 @@
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
Permission is hereby granted, free of charge, to any person obtaining a
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,