diff options
| author | Joel Martin <github@martintribe.org> | 2011-09-29 09:32:09 -0500 |
|---|---|---|
| committer | Joel Martin <github@martintribe.org> | 2011-09-29 09:32:09 -0500 |
| commit | 5299db1a004faec901eb31a2a6040b72c3bf4a6c (patch) | |
| tree | 316c91a8e5a316adf3827d16462e68ab65aa14a4 /LICENSE.txt | |
| parent | 938daad1c914b8b43bc8b11ac2acec664e7d36bc (diff) | |
| download | novnc-5299db1a004faec901eb31a2a6040b72c3bf4a6c.tar.gz | |
Formatting. Image renames/cleanup.mobile
- Remove the images using the old font.
- Simplify the naming of the new control bar icon images.
- Change keyboard input type to 'email'. 'url' type doesn't have
a space bar.
- Some clarifications to main LICENSE.txt file.
Diffstat (limited to 'LICENSE.txt')
| -rw-r--r-- | LICENSE.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index e04046c..755ace3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -5,7 +5,7 @@ Please refer to the individual source files and/or to the noVNC commit history: https://github.com/kanaka/noVNC/commits/master noVNC is licensed under the LGPL (GNU Lesser General Public License) -version 3 with the following exceptions (all LGPL compatible): +version 3 with the following exceptions (all LGPL-3 compatible): include/input.js : LGPL-2 or any later version @@ -21,14 +21,13 @@ version 3 with the following exceptions (all LGPL compatible): images/ : Creative Commons Attribution-ShareAlike http://creativecommons.org/licenses/by-sa/3.0/ - Uses of the work must be attributed - to the noVNC project. -The LGPL-3 and OFL license texts are included at: +The license texts are included at: docs/LICENSE.LGPL-3 and docs/LICENSE.GPL-3 docs/LICENSE.OFL-1.1 -Or alternatively the LGPL-3 license text may be found here: +Or alternatively the license texts may be found here: http://www.gnu.org/licenses/lgpl.html and http://www.gnu.org/licenses/gpl.html + http://scripts.sil.org/OFL |