merging javascript branch

17 files changed, 17 insertions, 17 deletions

diff --git a/php/demo/Ice/Makefile b/php/demo/Ice/Makefile
index a72a61df53e..3d43c4789e9 100644
--- a/php/demo/Ice/Makefile
+++ b/php/demo/Ice/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/Makefile.mak b/php/demo/Ice/Makefile.mak
index 511057939bb..da4249cd787 100644
--- a/php/demo/Ice/Makefile.mak
+++ b/php/demo/Ice/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/hello/Hello.ice b/php/demo/Ice/hello/Hello.ice
index aca54020837..3e548e149a1 100644
--- a/php/demo/Ice/hello/Hello.ice
+++ b/php/demo/Ice/hello/Hello.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/hello/Makefile b/php/demo/Ice/hello/Makefile
index f19cf640490..1ec6b40b3f0 100644
--- a/php/demo/Ice/hello/Makefile
+++ b/php/demo/Ice/hello/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/hello/Makefile.mak b/php/demo/Ice/hello/Makefile.mak
index 48c124bc656..daa71a69442 100644
--- a/php/demo/Ice/hello/Makefile.mak
+++ b/php/demo/Ice/hello/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/hello/client.php b/php/demo/Ice/hello/client.php
index f78a75d50a3..690bf3cc465 100644
--- a/php/demo/Ice/hello/client.php
+++ b/php/demo/Ice/hello/client.php
@@ -9,7 +9,7 @@
 <?php
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/hello/client_ns.php b/php/demo/Ice/hello/client_ns.php
index 75608dce4b6..07d4e373756 100644
--- a/php/demo/Ice/hello/client_ns.php
+++ b/php/demo/Ice/hello/client_ns.php
@@ -9,7 +9,7 @@
 <?php
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/optional/Client.php b/php/demo/Ice/optional/Client.php
index 80101601ce1..447e865278a 100644
--- a/php/demo/Ice/optional/Client.php
+++ b/php/demo/Ice/optional/Client.php
@@ -1,7 +1,7 @@
 <?php
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/optional/Client_ns.php b/php/demo/Ice/optional/Client_ns.php
index 908324e81c3..4aeef116fe1 100644
--- a/php/demo/Ice/optional/Client_ns.php
+++ b/php/demo/Ice/optional/Client_ns.php
@@ -1,7 +1,7 @@
 <?php
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/optional/Contact.ice b/php/demo/Ice/optional/Contact.ice
index efaa17caea7..ce47b858d5b 100644
--- a/php/demo/Ice/optional/Contact.ice
+++ b/php/demo/Ice/optional/Contact.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/optional/Makefile b/php/demo/Ice/optional/Makefile
index e050aa5ae7f..1d4e8c56758 100644
--- a/php/demo/Ice/optional/Makefile
+++ b/php/demo/Ice/optional/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/optional/Makefile.mak b/php/demo/Ice/optional/Makefile.mak
index 1a96908bb39..399742ddbe6 100644
--- a/php/demo/Ice/optional/Makefile.mak
+++ b/php/demo/Ice/optional/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/value/Client.php b/php/demo/Ice/value/Client.php
index bd8ec27982c..aedb5ce4f36 100644
--- a/php/demo/Ice/value/Client.php
+++ b/php/demo/Ice/value/Client.php
@@ -1,7 +1,7 @@
 <?php
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/value/Client_ns.php b/php/demo/Ice/value/Client_ns.php
index 1ab36048d8e..69138fc329d 100644
--- a/php/demo/Ice/value/Client_ns.php
+++ b/php/demo/Ice/value/Client_ns.php
@@ -1,7 +1,7 @@
 <?php
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/value/Makefile b/php/demo/Ice/value/Makefile
index 113390d64da..1aefb9c1f9e 100644
--- a/php/demo/Ice/value/Makefile
+++ b/php/demo/Ice/value/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/value/Makefile.mak b/php/demo/Ice/value/Makefile.mak
index 7e93f422567..3129e265048 100644
--- a/php/demo/Ice/value/Makefile.mak
+++ b/php/demo/Ice/value/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
diff --git a/php/demo/Ice/value/Value.ice b/php/demo/Ice/value/Value.ice
index 4ac477f0e03..bcbfeaeb7c1 100644
--- a/php/demo/Ice/value/Value.ice
+++ b/php/demo/Ice/value/Value.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.