merging javascript branch

10 files changed, 10 insertions, 10 deletions

diff --git a/java/test/Ice/classLoader/AbstractClassI.java b/java/test/Ice/classLoader/AbstractClassI.java
index b6f452dcbde..db3b9b347f3 100644
--- a/java/test/Ice/classLoader/AbstractClassI.java
+++ b/java/test/Ice/classLoader/AbstractClassI.java
@@ -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/java/test/Ice/classLoader/AllTests.java b/java/test/Ice/classLoader/AllTests.java
index 70e09b54f82..f5d127be9c2 100644
--- a/java/test/Ice/classLoader/AllTests.java
+++ b/java/test/Ice/classLoader/AllTests.java
@@ -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/java/test/Ice/classLoader/CertificateVerifierI.java b/java/test/Ice/classLoader/CertificateVerifierI.java
index 0340843dafa..ada4f00e86b 100644
--- a/java/test/Ice/classLoader/CertificateVerifierI.java
+++ b/java/test/Ice/classLoader/CertificateVerifierI.java
@@ -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/java/test/Ice/classLoader/Client.java b/java/test/Ice/classLoader/Client.java
index 10925e4f5f4..33384192655 100644
--- a/java/test/Ice/classLoader/Client.java
+++ b/java/test/Ice/classLoader/Client.java
@@ -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/java/test/Ice/classLoader/InitialI.java b/java/test/Ice/classLoader/InitialI.java
index 05381d7bf75..d8e2ddf44d8 100644
--- a/java/test/Ice/classLoader/InitialI.java
+++ b/java/test/Ice/classLoader/InitialI.java
@@ -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/java/test/Ice/classLoader/PasswordCallbackI.java b/java/test/Ice/classLoader/PasswordCallbackI.java
index 224701b4a4a..2312fb390a9 100644
--- a/java/test/Ice/classLoader/PasswordCallbackI.java
+++ b/java/test/Ice/classLoader/PasswordCallbackI.java
@@ -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/java/test/Ice/classLoader/PluginFactoryI.java b/java/test/Ice/classLoader/PluginFactoryI.java
index 55b8bcafc43..6f672614ca5 100644
--- a/java/test/Ice/classLoader/PluginFactoryI.java
+++ b/java/test/Ice/classLoader/PluginFactoryI.java
@@ -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/java/test/Ice/classLoader/Server.java b/java/test/Ice/classLoader/Server.java
index 61b38c1afaa..e8499a15f86 100644
--- a/java/test/Ice/classLoader/Server.java
+++ b/java/test/Ice/classLoader/Server.java
@@ -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/java/test/Ice/classLoader/Test.ice b/java/test/Ice/classLoader/Test.ice
index 97b7ac2407a..2df8659720e 100644
--- a/java/test/Ice/classLoader/Test.ice
+++ b/java/test/Ice/classLoader/Test.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/java/test/Ice/classLoader/run.py b/java/test/Ice/classLoader/run.py
index 4c48a8ed927..33fc2e8f3ac 100755
--- a/java/test/Ice/classLoader/run.py
+++ b/java/test/Ice/classLoader/run.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# 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.