Merge pull request #36 from veebs/master

Added webbit to NOTICE file
2011-10-29 22:47:13 -07:00 · 2011-10-29 22:47:13 -07:00 · 69d16c0382
commit 69d16c0382
parent bdc31e1603 418df7e9bf
1 changed files with 10 additions and 0 deletions
--- 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
+
+