summaryrefslogtreecommitdiff
path: root/ruby/test/Ice/acm
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 /ruby/test/Ice/acm
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 'ruby/test/Ice/acm')
-rw-r--r--ruby/test/Ice/acm/AllTests.rb2
-rwxr-xr-xruby/test/Ice/acm/Client.rb2
-rw-r--r--ruby/test/Ice/acm/Test.ice2
-rwxr-xr-xruby/test/Ice/acm/run.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/ruby/test/Ice/acm/AllTests.rb b/ruby/test/Ice/acm/AllTests.rb
index ba100d864d8..5c6b5e64f66 100644
--- a/ruby/test/Ice/acm/AllTests.rb
+++ b/ruby/test/Ice/acm/AllTests.rb
@@ -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/ruby/test/Ice/acm/Client.rb b/ruby/test/Ice/acm/Client.rb
index 2676472abe8..b18ef5d61f0 100755
--- a/ruby/test/Ice/acm/Client.rb
+++ b/ruby/test/Ice/acm/Client.rb
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# **********************************************************************
#
-# 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/ruby/test/Ice/acm/Test.ice b/ruby/test/Ice/acm/Test.ice
index 0c4c3b105ca..5ab98180dd3 100644
--- a/ruby/test/Ice/acm/Test.ice
+++ b/ruby/test/Ice/acm/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/ruby/test/Ice/acm/run.py b/ruby/test/Ice/acm/run.py
index 01b4a35a996..9bd838957b6 100755
--- a/ruby/test/Ice/acm/run.py
+++ b/ruby/test/Ice/acm/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.