summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/custom/ServerAMD.cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-03-01 10:04:29 -0500
committerJoe George <joe@zeroc.com>2016-03-01 10:04:29 -0500
commit7f1a8fd1c57d349d288989365ad18af7566cfcee (patch)
treee32fe85f6035913517187db3894dd45b17534f08 /cpp/test/Ice/custom/ServerAMD.cpp
parentIce::identityToString/Ice::stringToIdentity for PHP7 (diff)
parentUpdate copyright headers (diff)
downloadice-7f1a8fd1c57d349d288989365ad18af7566cfcee.tar.bz2
ice-7f1a8fd1c57d349d288989365ad18af7566cfcee.tar.xz
ice-7f1a8fd1c57d349d288989365ad18af7566cfcee.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test/Ice/custom/ServerAMD.cpp')
-rw-r--r--cpp/test/Ice/custom/ServerAMD.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp
index a8e2a653140..3b964c93491 100644
--- a/cpp/test/Ice/custom/ServerAMD.cpp
+++ b/cpp/test/Ice/custom/ServerAMD.cpp
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.