summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/admin
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 /csharp/test/Ice/admin
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 'csharp/test/Ice/admin')
-rw-r--r--csharp/test/Ice/admin/AllTests.cs2
-rw-r--r--csharp/test/Ice/admin/Client.cs2
-rw-r--r--csharp/test/Ice/admin/Makefile2
-rw-r--r--csharp/test/Ice/admin/Makefile.mak2
-rw-r--r--csharp/test/Ice/admin/Server.cs2
-rw-r--r--csharp/test/Ice/admin/Test.ice2
-rw-r--r--csharp/test/Ice/admin/TestI.cs2
-rwxr-xr-xcsharp/test/Ice/admin/run.py2
8 files changed, 8 insertions, 8 deletions
diff --git a/csharp/test/Ice/admin/AllTests.cs b/csharp/test/Ice/admin/AllTests.cs
index 0b61fec0483..d21191c2f93 100644
--- a/csharp/test/Ice/admin/AllTests.cs
+++ b/csharp/test/Ice/admin/AllTests.cs
@@ -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.
diff --git a/csharp/test/Ice/admin/Client.cs b/csharp/test/Ice/admin/Client.cs
index 29de8417989..c651a20271c 100644
--- a/csharp/test/Ice/admin/Client.cs
+++ b/csharp/test/Ice/admin/Client.cs
@@ -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.
diff --git a/csharp/test/Ice/admin/Makefile b/csharp/test/Ice/admin/Makefile
index 8abd1b0dba3..d1aec894221 100644
--- a/csharp/test/Ice/admin/Makefile
+++ b/csharp/test/Ice/admin/Makefile
@@ -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.
diff --git a/csharp/test/Ice/admin/Makefile.mak b/csharp/test/Ice/admin/Makefile.mak
index 4256a0c5fdd..232ca7c45fb 100644
--- a/csharp/test/Ice/admin/Makefile.mak
+++ b/csharp/test/Ice/admin/Makefile.mak
@@ -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.
diff --git a/csharp/test/Ice/admin/Server.cs b/csharp/test/Ice/admin/Server.cs
index 9007207cb52..b5f9d08892c 100644
--- a/csharp/test/Ice/admin/Server.cs
+++ b/csharp/test/Ice/admin/Server.cs
@@ -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.
diff --git a/csharp/test/Ice/admin/Test.ice b/csharp/test/Ice/admin/Test.ice
index fbc95428738..292269201db 100644
--- a/csharp/test/Ice/admin/Test.ice
+++ b/csharp/test/Ice/admin/Test.ice
@@ -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.
diff --git a/csharp/test/Ice/admin/TestI.cs b/csharp/test/Ice/admin/TestI.cs
index bb224875dd7..e3792434e8f 100644
--- a/csharp/test/Ice/admin/TestI.cs
+++ b/csharp/test/Ice/admin/TestI.cs
@@ -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.
diff --git a/csharp/test/Ice/admin/run.py b/csharp/test/Ice/admin/run.py
index aeb71ef588e..8d9a8c0837c 100755
--- a/csharp/test/Ice/admin/run.py
+++ b/csharp/test/Ice/admin/run.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# 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.