summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorges-Etienne Legendre <legege@legege.com>2013-02-04 13:48:07 -0500
committerGeorges-Etienne Legendre <legege@legege.com>2013-02-04 13:48:07 -0500
commitd402589076a7199a3258a7df5703994ee573a2e0 (patch)
treec3a4d3ea549734f3ea5905ea5f582344cebc1df4
parent91736294567db46f2f309f53c42f287622e21591 (diff)
Adjusting license
-rw-r--r--README.md2
-rw-r--r--example/express-app.js21
-rw-r--r--mjpeg-proxy.js21
3 files changed, 43 insertions, 1 deletions
diff --git a/README.md b/README.md
index ff44e68..7d8034f 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ License
(The MIT License)
-Copyright (C) 2012, Georges-Etienne Legendre <legege@legege.com>
+Copyright (C) 2013, Georges-Etienne Legendre <legege@legege.com>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
diff --git a/example/express-app.js b/example/express-app.js
index 9342f66..ad8e53c 100644
--- a/example/express-app.js
+++ b/example/express-app.js
@@ -1,3 +1,24 @@
+// Copyright (C) 2013, Georges-Etienne Legendre <legege@legege.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
var express = require('express');
var MjpegProxy = require('../mjpeg-proxy').MjpegProxy;
diff --git a/mjpeg-proxy.js b/mjpeg-proxy.js
index 6009e7d..afee772 100644
--- a/mjpeg-proxy.js
+++ b/mjpeg-proxy.js
@@ -1,3 +1,24 @@
+// Copyright (C) 2013, Georges-Etienne Legendre <legege@legege.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
var url = require('url');
var http = require('http');