Permalink
Browse files

Updating license info (adding lumberjack license info).

  • Loading branch information...
robbiehanson committed Jun 6, 2011
1 parent 8fde8b8 commit 5f24033e4f741ecd6f9689101b62320639a7ac24
Showing with 16 additions and 20 deletions.
  1. +16 −20 copying.txt
View
@@ -1,33 +1,29 @@
-AsyncSocket: (Public Domain)
+GCDAsyncSocket: (Public Domain)
-This class is released under the public domain. It was originally written by Dustin Voss, and has been modified and improved by Robbie Hanson.
+This class is released under the public domain.
+Originally created by Robbie Hanson in Q3 2010.
+Updated and maintained by Deusty LLC and the Mac/iOS development community.
------------------------------------------------------------
-SSCrypto Framework: (BSD Style License)
+CocoaLumberjack: (BSD Style License)
-Copyright (c) 2003, Septicus Software All rights reserved.
+Copyright (c) 2010, Deusty, LLC
+All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above
copyright notice, this list of conditions and the
- following disclaimer.
-
-* Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
+ following disclaimer.
-* Neither the name of Septicus Software nor the names of
- its contributors may be used to endorse or promote
- products derived from this software without specific
- prior written permission.
+* Neither the name of Deusty nor the names of its
+ contributors may be used to endorse or promote products
+ derived from this software without specific prior
+ written permission of Deusty, LLC.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------
@@ -46,7 +42,7 @@ with or without modification, are permitted provided that the following conditio
copyright notice, this list of conditions and the
following disclaimer.
-* Neither the name of Desuty Designs nor the names of its
+* Neither the name of Deusty Designs nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of Deusty Designs, LLC.

0 comments on commit 5f24033

Please sign in to comment.