actual license now

diff --git a/LICENSE b/LICENSE
index f4001a00c2bdc5f4bc8ecf85e373a2f283250a09..aec894ff57e68e92175f0407b4391be562e40930 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -2,4 +2,32 @@ NetWatch License
 
 Portions of NetWatch are distributed under a number of different licenses:
 - The contents of lwip/ are covered by lwip/COPYING
 
 Portions of NetWatch are distributed under a number of different licenses:
 - The contents of lwip/ are covered by lwip/COPYING

-- Other files contain copyright headers at the top of the file.
+- Other files may contain their own copyright headers at the top of the file.
+
+Those files which refer back to LICENSE are licensed as such:
+
+Copyright (c) 2008, Jacob Potter and Joshua Wise
+All rights reserved.
+
+Redistribution and use 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.
+    * Neither the name of the <organization> nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY <copyright holder> ''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 <copyright holder> 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.
+