aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaneef Mubarak <haneefmubarak@users.noreply.github.com>2014-02-22 12:11:35 -0800
committerHaneef Mubarak <haneefmubarak@users.noreply.github.com>2014-02-22 12:12:34 -0800
commit960e1eb84860a21ba3569fc771dbd0201366d2ff (patch)
tree9402a5c2ab1fba7fa6add3466ef98e0159568b23
parent6960d2296299e96d43e694806f5d35799ef8d39c (diff)
update year to 2014
-rw-r--r--LICENSE6
-rwxr-xr-xemcc2
-rw-r--r--tests/test_other.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index f742692e..447ddba1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,7 +13,7 @@ The full text of both licenses follows.
==============================================================================
-Copyright (c) 2010-2011 Emscripten authors, see AUTHORS file.
+Copyright (c) 2010-2014 Emscripten authors, see AUTHORS file.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,7 @@ THE SOFTWARE.
==============================================================================
-Copyright (c) 2010-2011 Emscripten authors, see AUTHORS file.
+Copyright (c) 2010-2014 Emscripten authors, see AUTHORS file.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -91,4 +91,4 @@ in accordance with the terms of the MIT license. Node's license follows:
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.
- """ \ No newline at end of file
+ """
diff --git a/emcc b/emcc
index 2c3033aa..6d8ff6f6 100755
--- a/emcc
+++ b/emcc
@@ -573,7 +573,7 @@ elif sys.argv[1] == '--version':
finally:
os.chdir(here)
print '''emcc (Emscripten GCC-like replacement) %s (%s)
-Copyright (C) 2013 the Emscripten authors (see AUTHORS.txt)
+Copyright (C) 2014 the Emscripten authors (see AUTHORS.txt)
This is free and open source software under the MIT license.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
''' % (shared.EMSCRIPTEN_VERSION, revision)
diff --git a/tests/test_other.py b/tests/test_other.py
index b4abf275..80461972 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -19,7 +19,7 @@ class other(RunnerCore):
output = Popen([PYTHON, compiler, '--version'], stdout=PIPE, stderr=PIPE).communicate()
output = output[0].replace('\r', '')
self.assertContained('''emcc (Emscripten GCC-like replacement)''', output)
- self.assertContained('''Copyright (C) 2013 the Emscripten authors (see AUTHORS.txt)
+ self.assertContained('''Copyright (C) 2014 the Emscripten authors (see AUTHORS.txt)
This is free and open source software under the MIT license.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
''', output)