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/IceSSL/configuration | |
| 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/IceSSL/configuration')
| -rw-r--r-- | csharp/test/IceSSL/configuration/AllTests.cs | 2 | ||||
| -rw-r--r-- | csharp/test/IceSSL/configuration/CertificateVerifierI.cs | 2 | ||||
| -rw-r--r-- | csharp/test/IceSSL/configuration/Client.cs | 2 | ||||
| -rw-r--r-- | csharp/test/IceSSL/configuration/PasswordCallbackI.cs | 2 | ||||
| -rw-r--r-- | csharp/test/IceSSL/configuration/Server.cs | 2 | ||||
| -rw-r--r-- | csharp/test/IceSSL/configuration/Test.ice | 2 | ||||
| -rw-r--r-- | csharp/test/IceSSL/configuration/TestI.cs | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs index a2813a4f909..52c4d9f2bad 100644 --- a/csharp/test/IceSSL/configuration/AllTests.cs +++ b/csharp/test/IceSSL/configuration/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/IceSSL/configuration/CertificateVerifierI.cs b/csharp/test/IceSSL/configuration/CertificateVerifierI.cs index 13c25af56b9..47be15a4b83 100644 --- a/csharp/test/IceSSL/configuration/CertificateVerifierI.cs +++ b/csharp/test/IceSSL/configuration/CertificateVerifierI.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/IceSSL/configuration/Client.cs b/csharp/test/IceSSL/configuration/Client.cs index 3d64e6c7b1b..abe2e25ee05 100644 --- a/csharp/test/IceSSL/configuration/Client.cs +++ b/csharp/test/IceSSL/configuration/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/IceSSL/configuration/PasswordCallbackI.cs b/csharp/test/IceSSL/configuration/PasswordCallbackI.cs index e88c97a0fbf..593fc82555c 100644 --- a/csharp/test/IceSSL/configuration/PasswordCallbackI.cs +++ b/csharp/test/IceSSL/configuration/PasswordCallbackI.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/IceSSL/configuration/Server.cs b/csharp/test/IceSSL/configuration/Server.cs index c6ea3e74cc9..abcc5b0d65b 100644 --- a/csharp/test/IceSSL/configuration/Server.cs +++ b/csharp/test/IceSSL/configuration/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/IceSSL/configuration/Test.ice b/csharp/test/IceSSL/configuration/Test.ice index f742635d1a4..fbe20c252c0 100644 --- a/csharp/test/IceSSL/configuration/Test.ice +++ b/csharp/test/IceSSL/configuration/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. diff --git a/csharp/test/IceSSL/configuration/TestI.cs b/csharp/test/IceSSL/configuration/TestI.cs index 021197219b2..f05b8198741 100644 --- a/csharp/test/IceSSL/configuration/TestI.cs +++ b/csharp/test/IceSSL/configuration/TestI.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. |