diff options
| author | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
| commit | dc5678e6988bad79336033518f8f2378f7c34cb2 (patch) | |
| tree | f1b7d00d8bfde31297c4473d62ace3d05031b985 /ruby/test/Ice/acm | |
| parent | Connection wizard dialog becomes readonly (diff) | |
| parent | ICE-7506 - Update copyright to 2017 (diff) | |
| download | ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.bz2 ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.xz ice-dc5678e6988bad79336033518f8f2378f7c34cb2.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'ruby/test/Ice/acm')
| -rw-r--r-- | ruby/test/Ice/acm/AllTests.rb | 2 | ||||
| -rwxr-xr-x | ruby/test/Ice/acm/Client.rb | 2 | ||||
| -rw-r--r-- | ruby/test/Ice/acm/Test.ice | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ruby/test/Ice/acm/AllTests.rb b/ruby/test/Ice/acm/AllTests.rb index a147c616693..54f83e4bfc6 100644 --- a/ruby/test/Ice/acm/AllTests.rb +++ b/ruby/test/Ice/acm/AllTests.rb @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2017 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 e0cca249e6d..f8ca446a584 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-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2017 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 d78abd6eb0f..7018c9df821 100644 --- a/ruby/test/Ice/acm/Test.ice +++ b/ruby/test/Ice/acm/Test.ice @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. |