Merge pull request netty#36 from veebs/master

Added webbit to NOTICE file
shijinkui · Oct 30, 2011 · 69d16c0 · 69d16c0
2 parents bdc31e1 + 418df7e
commit 69d16c0
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -96,3 +96,13 @@ framework implementation, which can be obtained at:
     * license/LICENSE.felix.txt (Apache License 2.0)
   * HOMEPAGE:
     * http://felix.apache.org/
+
+This product optionally depends on 'Webbit', a Java event based  
+WebSocket and HTTP server:
+
+  * LICENSE:
+    * license/LICENSE.webbit.txt (BSD License)
+  * HOMEPAGE:
+    * https://github.com/joewalnes/webbit
+
+