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/src | |
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/src')
-rw-r--r-- | ruby/src/IceRuby/Communicator.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Communicator.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Config.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Connection.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Connection.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Endpoint.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Endpoint.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/ImplicitContext.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/ImplicitContext.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Init.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Logger.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Logger.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Operation.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Operation.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Properties.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Properties.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Proxy.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Proxy.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Slice.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Slice.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Types.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Types.h | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Util.cpp | 2 | ||||
-rw-r--r-- | ruby/src/IceRuby/Util.h | 2 |
24 files changed, 24 insertions, 24 deletions
diff --git a/ruby/src/IceRuby/Communicator.cpp b/ruby/src/IceRuby/Communicator.cpp index cb7c24fd9a5..19d39267e44 100644 --- a/ruby/src/IceRuby/Communicator.cpp +++ b/ruby/src/IceRuby/Communicator.cpp @@ -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/src/IceRuby/Communicator.h b/ruby/src/IceRuby/Communicator.h index 86a69a03c71..62229c12d05 100644 --- a/ruby/src/IceRuby/Communicator.h +++ b/ruby/src/IceRuby/Communicator.h @@ -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/src/IceRuby/Config.h b/ruby/src/IceRuby/Config.h index f8117b4d554..fa5a8772a74 100644 --- a/ruby/src/IceRuby/Config.h +++ b/ruby/src/IceRuby/Config.h @@ -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/src/IceRuby/Connection.cpp b/ruby/src/IceRuby/Connection.cpp index 9c0a4b76ed1..4f6b615ffc2 100644 --- a/ruby/src/IceRuby/Connection.cpp +++ b/ruby/src/IceRuby/Connection.cpp @@ -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/src/IceRuby/Connection.h b/ruby/src/IceRuby/Connection.h index 765adb36efb..3c7a1a31038 100644 --- a/ruby/src/IceRuby/Connection.h +++ b/ruby/src/IceRuby/Connection.h @@ -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/src/IceRuby/Endpoint.cpp b/ruby/src/IceRuby/Endpoint.cpp index 46ced54ea11..70893f481ca 100644 --- a/ruby/src/IceRuby/Endpoint.cpp +++ b/ruby/src/IceRuby/Endpoint.cpp @@ -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/src/IceRuby/Endpoint.h b/ruby/src/IceRuby/Endpoint.h index a88b9777a25..54dba244528 100644 --- a/ruby/src/IceRuby/Endpoint.h +++ b/ruby/src/IceRuby/Endpoint.h @@ -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/src/IceRuby/ImplicitContext.cpp b/ruby/src/IceRuby/ImplicitContext.cpp index 7c75c815cda..e7bc0fa3853 100644 --- a/ruby/src/IceRuby/ImplicitContext.cpp +++ b/ruby/src/IceRuby/ImplicitContext.cpp @@ -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/src/IceRuby/ImplicitContext.h b/ruby/src/IceRuby/ImplicitContext.h index 2d5cadd1656..fb1d0bc3f85 100644 --- a/ruby/src/IceRuby/ImplicitContext.h +++ b/ruby/src/IceRuby/ImplicitContext.h @@ -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/src/IceRuby/Init.cpp b/ruby/src/IceRuby/Init.cpp index a0c2663f4ed..a70dd421691 100644 --- a/ruby/src/IceRuby/Init.cpp +++ b/ruby/src/IceRuby/Init.cpp @@ -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/src/IceRuby/Logger.cpp b/ruby/src/IceRuby/Logger.cpp index 61adc63c110..f21f0925339 100644 --- a/ruby/src/IceRuby/Logger.cpp +++ b/ruby/src/IceRuby/Logger.cpp @@ -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/src/IceRuby/Logger.h b/ruby/src/IceRuby/Logger.h index 7f8ed5fb99c..efbfa5b0e77 100644 --- a/ruby/src/IceRuby/Logger.h +++ b/ruby/src/IceRuby/Logger.h @@ -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/src/IceRuby/Operation.cpp b/ruby/src/IceRuby/Operation.cpp index 4c65fc6cc07..bc485a2b90d 100644 --- a/ruby/src/IceRuby/Operation.cpp +++ b/ruby/src/IceRuby/Operation.cpp @@ -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/src/IceRuby/Operation.h b/ruby/src/IceRuby/Operation.h index 5ee4d810be4..d0bab2f800e 100644 --- a/ruby/src/IceRuby/Operation.h +++ b/ruby/src/IceRuby/Operation.h @@ -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/src/IceRuby/Properties.cpp b/ruby/src/IceRuby/Properties.cpp index dd74ec6efd0..83ac449a2d2 100644 --- a/ruby/src/IceRuby/Properties.cpp +++ b/ruby/src/IceRuby/Properties.cpp @@ -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/src/IceRuby/Properties.h b/ruby/src/IceRuby/Properties.h index b62189797d4..56d79c43b48 100644 --- a/ruby/src/IceRuby/Properties.h +++ b/ruby/src/IceRuby/Properties.h @@ -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/src/IceRuby/Proxy.cpp b/ruby/src/IceRuby/Proxy.cpp index 2f59a6a9ee9..51a02f5e108 100644 --- a/ruby/src/IceRuby/Proxy.cpp +++ b/ruby/src/IceRuby/Proxy.cpp @@ -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/src/IceRuby/Proxy.h b/ruby/src/IceRuby/Proxy.h index 0678a377e16..e64c8f28f94 100644 --- a/ruby/src/IceRuby/Proxy.h +++ b/ruby/src/IceRuby/Proxy.h @@ -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/src/IceRuby/Slice.cpp b/ruby/src/IceRuby/Slice.cpp index 7c63a86dd6b..858da4819cc 100644 --- a/ruby/src/IceRuby/Slice.cpp +++ b/ruby/src/IceRuby/Slice.cpp @@ -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/src/IceRuby/Slice.h b/ruby/src/IceRuby/Slice.h index dfa579812a2..6f6741f3973 100644 --- a/ruby/src/IceRuby/Slice.h +++ b/ruby/src/IceRuby/Slice.h @@ -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/src/IceRuby/Types.cpp b/ruby/src/IceRuby/Types.cpp index 43326e728b6..16085d06347 100644 --- a/ruby/src/IceRuby/Types.cpp +++ b/ruby/src/IceRuby/Types.cpp @@ -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/src/IceRuby/Types.h b/ruby/src/IceRuby/Types.h index 9d2ae37ee95..57cf634a528 100644 --- a/ruby/src/IceRuby/Types.h +++ b/ruby/src/IceRuby/Types.h @@ -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/src/IceRuby/Util.cpp b/ruby/src/IceRuby/Util.cpp index 84708f2dfb8..6e9b0a27c4b 100644 --- a/ruby/src/IceRuby/Util.cpp +++ b/ruby/src/IceRuby/Util.cpp @@ -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/src/IceRuby/Util.h b/ruby/src/IceRuby/Util.h index 2487d0a7570..ffe792a8993 100644 --- a/ruby/src/IceRuby/Util.h +++ b/ruby/src/IceRuby/Util.h @@ -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. |