Flesh out authors/contributors and licenses.

diff --git a/LICENSE.txt b/LICENSE.txt
index 755ace355e83014387ca88dc4375907029c1baab..6a1131bfccd76130d71da7c46d0e1c992d932205 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -13,6 +13,8 @@ version 3 with the following exceptions (all LGPL-3 compatible):
    
     include/des.js             : Various BSD style licenses
 
+    include/jsunzip.js         : zlib/libpng license
+
     include/web-socket-js/     : New BSD license. Source code at
                                  http://github.com/gimite/web-socket-js
 

diff --git a/README.md b/README.md
index 2be5adc8e0dcc8ddce35fab9de2669ae7a22aaa9..7aeb7fa680debd2c9a5f3049aa3c643987b2a797 100644 (file)
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ their products including: [Ganeti Web Manager](http://code.osuosl.org/projects/g
 ### Features
 
 * Supports all modern browsers including mobile (iOS, Android)
-* Supported VNC encodings: raw, copyrect, rre, hextile, tightPNG
+* Supported VNC encodings: raw, copyrect, rre, hextile, tight, tightPNG
 * WebSocket SSL/TLS encryption (i.e. "wss://") support
 * 24-bit true color and 8 bit colour mapped
 * Supports desktop resize notification/pseudo-encoding
@@ -26,8 +26,6 @@ their products including: [Ganeti Web Manager](http://code.osuosl.org/projects/g
 * Easy site integration and theming (3 example themes included)
 * Licensed under the [LGPLv3](http://www.gnu.org/licenses/lgpl.html)
 
-* Support for tight encoding (contributed by Mercuri.ca)
-
 ### Screenshots
 
 Running in Chrome before and after connecting:
@@ -86,3 +84,19 @@ a python proxy included ('websockify').
 * [Troubleshooting noVNC](https://github.com/kanaka/noVNC/wiki/Troubleshooting) problems.
 
 
+### Authors/Contributors
+
+* noVNC : Joel Martin (github@martintribe.org)
+    * New UI and Icons : Chris Gordon
+    * Original Logo : Michael Sersen
+    * tight encoding : Michael Tinglof (Mercuri.ca)
+
+* Included libraries:
+    * web-socket-js : Hiroshi Ichikawa (github.com/gimite/web-socket-js)
+    * as3crypto : Henri Torgemane (code.google.com/p/as3crypto)
+    * base64 : Martijn Pieters (Digital Creations 2), Samuel Sieb (sieb.net)
+    * jsunzip : Erik Moller (github.com/operasoftware/jsunzip),
+    * tinflate : Joergen Ibsen (ibsensoftware.com)
+    * DES : Dave Zimmerman (Widget Workshop), Jef Poskanzer (ACME Labs)
+
+