summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/ami
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/ami
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/ami')
-rw-r--r--csharp/test/Ice/ami/AllTests.cs2
-rw-r--r--csharp/test/Ice/ami/Client.cs2
-rw-r--r--csharp/test/Ice/ami/Collocated.cs2
-rw-r--r--csharp/test/Ice/ami/Makefile2
-rw-r--r--csharp/test/Ice/ami/Makefile.mak2
-rw-r--r--csharp/test/Ice/ami/Server.cs2
-rw-r--r--csharp/test/Ice/ami/Test.ice2
-rw-r--r--csharp/test/Ice/ami/TestI.cs2
-rwxr-xr-xcsharp/test/Ice/ami/run.py2
9 files changed, 9 insertions, 9 deletions
diff --git a/csharp/test/Ice/ami/AllTests.cs b/csharp/test/Ice/ami/AllTests.cs
index a9836f1e4e3..7bb88d55cfd 100644
--- a/csharp/test/Ice/ami/AllTests.cs
+++ b/csharp/test/Ice/ami/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/ami/Client.cs b/csharp/test/Ice/ami/Client.cs
index 6d7cdf71bde..246f5b6eb05 100644
--- a/csharp/test/Ice/ami/Client.cs
+++ b/csharp/test/Ice/ami/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/ami/Collocated.cs b/csharp/test/Ice/ami/Collocated.cs
index ec0d23e21e3..f06511fa0a0 100644
--- a/csharp/test/Ice/ami/Collocated.cs
+++ b/csharp/test/Ice/ami/Collocated.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/ami/Makefile b/csharp/test/Ice/ami/Makefile
index 0af9a0c57c0..35df1956161 100644
--- a/csharp/test/Ice/ami/Makefile
+++ b/csharp/test/Ice/ami/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/ami/Makefile.mak b/csharp/test/Ice/ami/Makefile.mak
index 721387666ca..04697161cba 100644
--- a/csharp/test/Ice/ami/Makefile.mak
+++ b/csharp/test/Ice/ami/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/ami/Server.cs b/csharp/test/Ice/ami/Server.cs
index 5eb25f2210b..bc5fffdd700 100644
--- a/csharp/test/Ice/ami/Server.cs
+++ b/csharp/test/Ice/ami/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/ami/Test.ice b/csharp/test/Ice/ami/Test.ice
index e5613fe9f94..a9c4ffb88bc 100644
--- a/csharp/test/Ice/ami/Test.ice
+++ b/csharp/test/Ice/ami/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/ami/TestI.cs b/csharp/test/Ice/ami/TestI.cs
index 7c24b7f7c3a..01f368d4887 100644
--- a/csharp/test/Ice/ami/TestI.cs
+++ b/csharp/test/Ice/ami/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/ami/run.py b/csharp/test/Ice/ami/run.py
index 5eabdba41f2..df7bc2b4ac3 100755
--- a/csharp/test/Ice/ami/run.py
+++ b/csharp/test/Ice/ami/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.