diff options
author | Joel Martin <github@martintribe.org> | 2016-06-13 10:22:43 -0500 |
---|---|---|
committer | Joel Martin <github@martintribe.org> | 2016-06-13 10:22:43 -0500 |
commit | 15e733f5330345b41e91927adaa2ce8f984f0593 (patch) | |
tree | b76310c9d72a8219b3223aac8ddb32bd673beb18 | |
parent | b2cdd558590c942150838d99c7429ec9a43329ce (diff) | |
download | novnc-15e733f5330345b41e91927adaa2ce8f984f0593.tar.gz |
Clarify that utils/launch.sh is MPL-2.0
Also, note in the top-level license file that the default noVNC
license for files that are not explicitly marked or mentioned in
the LICENSE.txt file are by default MPL-2.0 licensed.
-rw-r--r-- | LICENSE.txt | 4 | ||||
-rwxr-xr-x | utils/launch.sh | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 924d2b0..f217929 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -57,6 +57,10 @@ licenses (all MPL 2.0 compatible): utils/inflator.partial.js include/inflator.js : MIT (for pako) +Any other files not mentioned above are typically marked with +a copyright/license header at the top of the file. The default noVNC +license is MPL-2.0. + The following license texts are included: docs/LICENSE.MPL-2.0 diff --git a/utils/launch.sh b/utils/launch.sh index ecee06c..af350b0 100755 --- a/utils/launch.sh +++ b/utils/launch.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# Copyright 2016 Joel Martin +# Copyright 2016 Solly Ross +# Licensed under MPL 2.0 or any later version (see LICENSE.txt) + usage() { if [ "$*" ]; then echo "$*" |