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 /csharp/test/Ice/inheritance | |
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 'csharp/test/Ice/inheritance')
-rw-r--r-- | csharp/test/Ice/inheritance/AllTests.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/CAI.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/CBI.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/CCI.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/CDI.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/Client.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/Collocated.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/IAI.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/IB1I.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/IB2I.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/ICI.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/InitialI.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/Server.cs | 2 | ||||
-rw-r--r-- | csharp/test/Ice/inheritance/Test.ice | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/csharp/test/Ice/inheritance/AllTests.cs b/csharp/test/Ice/inheritance/AllTests.cs index 6c2b4fd088c..01f198da062 100644 --- a/csharp/test/Ice/inheritance/AllTests.cs +++ b/csharp/test/Ice/inheritance/AllTests.cs @@ -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/csharp/test/Ice/inheritance/CAI.cs b/csharp/test/Ice/inheritance/CAI.cs index 1ab65091e18..1c5386f4dc1 100644 --- a/csharp/test/Ice/inheritance/CAI.cs +++ b/csharp/test/Ice/inheritance/CAI.cs @@ -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/csharp/test/Ice/inheritance/CBI.cs b/csharp/test/Ice/inheritance/CBI.cs index b5cebbdbecb..5ba21a910ff 100644 --- a/csharp/test/Ice/inheritance/CBI.cs +++ b/csharp/test/Ice/inheritance/CBI.cs @@ -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/csharp/test/Ice/inheritance/CCI.cs b/csharp/test/Ice/inheritance/CCI.cs index 353f8955922..722ba84cf18 100644 --- a/csharp/test/Ice/inheritance/CCI.cs +++ b/csharp/test/Ice/inheritance/CCI.cs @@ -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/csharp/test/Ice/inheritance/CDI.cs b/csharp/test/Ice/inheritance/CDI.cs index c29c165b32c..e9e253a7424 100644 --- a/csharp/test/Ice/inheritance/CDI.cs +++ b/csharp/test/Ice/inheritance/CDI.cs @@ -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/csharp/test/Ice/inheritance/Client.cs b/csharp/test/Ice/inheritance/Client.cs index 3ffaca65c44..85d775b270e 100644 --- a/csharp/test/Ice/inheritance/Client.cs +++ b/csharp/test/Ice/inheritance/Client.cs @@ -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/csharp/test/Ice/inheritance/Collocated.cs b/csharp/test/Ice/inheritance/Collocated.cs index df775566080..e16594dd73a 100644 --- a/csharp/test/Ice/inheritance/Collocated.cs +++ b/csharp/test/Ice/inheritance/Collocated.cs @@ -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/csharp/test/Ice/inheritance/IAI.cs b/csharp/test/Ice/inheritance/IAI.cs index 655530b7744..d33af129697 100644 --- a/csharp/test/Ice/inheritance/IAI.cs +++ b/csharp/test/Ice/inheritance/IAI.cs @@ -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/csharp/test/Ice/inheritance/IB1I.cs b/csharp/test/Ice/inheritance/IB1I.cs index 61b0eba1d0b..fd9f39f2366 100644 --- a/csharp/test/Ice/inheritance/IB1I.cs +++ b/csharp/test/Ice/inheritance/IB1I.cs @@ -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/csharp/test/Ice/inheritance/IB2I.cs b/csharp/test/Ice/inheritance/IB2I.cs index ebd717f0ce3..6b704b04f8b 100644 --- a/csharp/test/Ice/inheritance/IB2I.cs +++ b/csharp/test/Ice/inheritance/IB2I.cs @@ -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/csharp/test/Ice/inheritance/ICI.cs b/csharp/test/Ice/inheritance/ICI.cs index ccee17faf7a..1346e51db28 100644 --- a/csharp/test/Ice/inheritance/ICI.cs +++ b/csharp/test/Ice/inheritance/ICI.cs @@ -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/csharp/test/Ice/inheritance/InitialI.cs b/csharp/test/Ice/inheritance/InitialI.cs index 3e2d8edd745..51506e23bd8 100644 --- a/csharp/test/Ice/inheritance/InitialI.cs +++ b/csharp/test/Ice/inheritance/InitialI.cs @@ -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/csharp/test/Ice/inheritance/Server.cs b/csharp/test/Ice/inheritance/Server.cs index 2844a25ff3d..d97e3023350 100644 --- a/csharp/test/Ice/inheritance/Server.cs +++ b/csharp/test/Ice/inheritance/Server.cs @@ -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/csharp/test/Ice/inheritance/Test.ice b/csharp/test/Ice/inheritance/Test.ice index 28faa3b8c9e..372dbcc414a 100644 --- a/csharp/test/Ice/inheritance/Test.ice +++ b/csharp/test/Ice/inheritance/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. |