Skip to content

Commit

Permalink
Merge pull request #36 from veebs/master
Browse files Browse the repository at this point in the history
Added webbit to NOTICE file
  • Loading branch information
veebs committed Oct 30, 2011
2 parents bdc31e1 + 418df7e commit 69d16c0
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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


0 comments on commit 69d16c0

Please sign in to comment.