merging javascript branch

10 files changed, 10 insertions, 10 deletions

diff --git a/java/demo/Ice/plugin/Client.java b/java/demo/Ice/plugin/Client.java
index 5892a5f8b9a..ed71bf74eaf 100644
--- a/java/demo/Ice/plugin/Client.java
+++ b/java/demo/Ice/plugin/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/demo/Ice/plugin/Hello.ice b/java/demo/Ice/plugin/Hello.ice
index 4859970f6a1..617d061e087 100644
--- a/java/demo/Ice/plugin/Hello.ice
+++ b/java/demo/Ice/plugin/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/java/demo/Ice/plugin/HelloI.java b/java/demo/Ice/plugin/HelloI.java
index 500dd064dda..8b156060124 100644
--- a/java/demo/Ice/plugin/HelloI.java
+++ b/java/demo/Ice/plugin/HelloI.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/demo/Ice/plugin/HelloPluginFactoryI.java b/java/demo/Ice/plugin/HelloPluginFactoryI.java
index 551c51e8567..951bec921bf 100644
--- a/java/demo/Ice/plugin/HelloPluginFactoryI.java
+++ b/java/demo/Ice/plugin/HelloPluginFactoryI.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/demo/Ice/plugin/HelloPluginI.java b/java/demo/Ice/plugin/HelloPluginI.java
index 76472f4e5b2..f5c92687202 100644
--- a/java/demo/Ice/plugin/HelloPluginI.java
+++ b/java/demo/Ice/plugin/HelloPluginI.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/demo/Ice/plugin/LoggerI.java b/java/demo/Ice/plugin/LoggerI.java
index 69ffdce3036..9e9eb79ec29 100644
--- a/java/demo/Ice/plugin/LoggerI.java
+++ b/java/demo/Ice/plugin/LoggerI.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/demo/Ice/plugin/LoggerPluginFactoryI.java b/java/demo/Ice/plugin/LoggerPluginFactoryI.java
index c587560a0db..5e22eda154e 100644
--- a/java/demo/Ice/plugin/LoggerPluginFactoryI.java
+++ b/java/demo/Ice/plugin/LoggerPluginFactoryI.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/demo/Ice/plugin/Server.java b/java/demo/Ice/plugin/Server.java
index 89e1ea94558..679bfec5ebd 100644
--- a/java/demo/Ice/plugin/Server.java
+++ b/java/demo/Ice/plugin/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/demo/Ice/plugin/build.xml b/java/demo/Ice/plugin/build.xml
index 04651c2452a..65c5f2bde08 100644
--- a/java/demo/Ice/plugin/build.xml
+++ b/java/demo/Ice/plugin/build.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- 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/demo/Ice/plugin/expect.py b/java/demo/Ice/plugin/expect.py
index 96b87025641..632af839602 100755
--- a/java/demo/Ice/plugin/expect.py
+++ b/java/demo/Ice/plugin/expect.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.