summaryrefslogtreecommitdiff
path: root/java/demo/Ice/optional
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2014-03-19 12:45:55 -0700
committerMark Spruiell <mes@zeroc.com>2014-03-19 12:45:55 -0700
commitcdcffbcc3c3c052afdeb772ff0167e7a90b525bb (patch)
tree4f16ee41ef7d33394c44e9db81e4d6cd89908250 /java/demo/Ice/optional
parentfixing testicedist.py for 5487 (diff)
downloadice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2
ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz
ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip
merging javascript branch
Diffstat (limited to 'java/demo/Ice/optional')
-rw-r--r--java/demo/Ice/optional/Client.java2
-rw-r--r--java/demo/Ice/optional/Contact.ice2
-rw-r--r--java/demo/Ice/optional/ContactDBI.java2
-rw-r--r--java/demo/Ice/optional/Server.java2
-rw-r--r--java/demo/Ice/optional/build.xml2
-rwxr-xr-xjava/demo/Ice/optional/expect.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/java/demo/Ice/optional/Client.java b/java/demo/Ice/optional/Client.java
index e7d585f911d..a65052cde49 100644
--- a/java/demo/Ice/optional/Client.java
+++ b/java/demo/Ice/optional/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/optional/Contact.ice b/java/demo/Ice/optional/Contact.ice
index 897c0109383..7554ac33bb8 100644
--- a/java/demo/Ice/optional/Contact.ice
+++ b/java/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/java/demo/Ice/optional/ContactDBI.java b/java/demo/Ice/optional/ContactDBI.java
index 4230c86c66d..18370fe1161 100644
--- a/java/demo/Ice/optional/ContactDBI.java
+++ b/java/demo/Ice/optional/ContactDBI.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/optional/Server.java b/java/demo/Ice/optional/Server.java
index f9f7754f14d..0554d083b08 100644
--- a/java/demo/Ice/optional/Server.java
+++ b/java/demo/Ice/optional/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/optional/build.xml b/java/demo/Ice/optional/build.xml
index e072ab4ae63..d651cad6fd1 100644
--- a/java/demo/Ice/optional/build.xml
+++ b/java/demo/Ice/optional/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/optional/expect.py b/java/demo/Ice/optional/expect.py
index 6baca706537..cd39faafaa1 100755
--- a/java/demo/Ice/optional/expect.py
+++ b/java/demo/Ice/optional/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.