diff options
author | Joe George <joe@zeroc.com> | 2016-03-01 10:04:29 -0500 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2016-03-01 10:04:29 -0500 |
commit | 7f1a8fd1c57d349d288989365ad18af7566cfcee (patch) | |
tree | e32fe85f6035913517187db3894dd45b17534f08 /ruby/test/Ice/slicing/exceptions | |
parent | Ice::identityToString/Ice::stringToIdentity for PHP7 (diff) | |
parent | Update copyright headers (diff) | |
download | ice-7f1a8fd1c57d349d288989365ad18af7566cfcee.tar.bz2 ice-7f1a8fd1c57d349d288989365ad18af7566cfcee.tar.xz ice-7f1a8fd1c57d349d288989365ad18af7566cfcee.zip |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'ruby/test/Ice/slicing/exceptions')
-rw-r--r-- | ruby/test/Ice/slicing/exceptions/AllTests.rb | 2 | ||||
-rwxr-xr-x | ruby/test/Ice/slicing/exceptions/Client.rb | 2 | ||||
-rw-r--r-- | ruby/test/Ice/slicing/exceptions/Test.ice | 2 | ||||
-rwxr-xr-x | ruby/test/Ice/slicing/exceptions/run.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ruby/test/Ice/slicing/exceptions/AllTests.rb b/ruby/test/Ice/slicing/exceptions/AllTests.rb index 09330ced0b4..746cd365bf8 100644 --- a/ruby/test/Ice/slicing/exceptions/AllTests.rb +++ b/ruby/test/Ice/slicing/exceptions/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/slicing/exceptions/Client.rb b/ruby/test/Ice/slicing/exceptions/Client.rb index a1ab21c7411..1a9dc13ac47 100755 --- a/ruby/test/Ice/slicing/exceptions/Client.rb +++ b/ruby/test/Ice/slicing/exceptions/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/slicing/exceptions/Test.ice b/ruby/test/Ice/slicing/exceptions/Test.ice index e81c34580f6..c32e896e729 100644 --- a/ruby/test/Ice/slicing/exceptions/Test.ice +++ b/ruby/test/Ice/slicing/exceptions/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/slicing/exceptions/run.py b/ruby/test/Ice/slicing/exceptions/run.py index c40f6f06f3e..d27134b1154 100755 --- a/ruby/test/Ice/slicing/exceptions/run.py +++ b/ruby/test/Ice/slicing/exceptions/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. |