Merge branch 'master' of github.com:haneefmubarak/emscripten into incoming

4 files changed, 6 insertions, 5 deletions

diff --git a/AUTHORS b/AUTHORS
index 6c6b3f27..6b548922 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -126,3 +126,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Jack A. Arrington <jack@epicpineapple.com>
 * Richard Janicek <r@janicek.co>
 * Joel Croteau <jcroteau@gmail.com>
+* Haneef Mubarak <haneef503@gmail.com>
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)