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 /csharp/src/IceDiscovery | |
| 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 'csharp/src/IceDiscovery')
| -rw-r--r-- | csharp/src/IceDiscovery/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | csharp/src/IceDiscovery/LocatorI.cs | 2 | ||||
| -rw-r--r-- | csharp/src/IceDiscovery/LookupI.cs | 2 | ||||
| -rw-r--r-- | csharp/src/IceDiscovery/Makefile | 2 | ||||
| -rw-r--r-- | csharp/src/IceDiscovery/Makefile.mak | 2 | ||||
| -rw-r--r-- | csharp/src/IceDiscovery/PluginI.cs | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs index 4b454f037de..08a6750bbf0 100644 --- a/csharp/src/IceDiscovery/AssemblyInfo.cs +++ b/csharp/src/IceDiscovery/AssemblyInfo.cs @@ -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/csharp/src/IceDiscovery/LocatorI.cs b/csharp/src/IceDiscovery/LocatorI.cs index b0adf04ce90..ddda07a627b 100644 --- a/csharp/src/IceDiscovery/LocatorI.cs +++ b/csharp/src/IceDiscovery/LocatorI.cs @@ -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/csharp/src/IceDiscovery/LookupI.cs b/csharp/src/IceDiscovery/LookupI.cs index d516eb8c16a..233c1a2128b 100644 --- a/csharp/src/IceDiscovery/LookupI.cs +++ b/csharp/src/IceDiscovery/LookupI.cs @@ -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/csharp/src/IceDiscovery/Makefile b/csharp/src/IceDiscovery/Makefile index 88581745332..683d26deb38 100644 --- a/csharp/src/IceDiscovery/Makefile +++ b/csharp/src/IceDiscovery/Makefile @@ -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/csharp/src/IceDiscovery/Makefile.mak b/csharp/src/IceDiscovery/Makefile.mak index 1ef6b9d9920..7521988037d 100644 --- a/csharp/src/IceDiscovery/Makefile.mak +++ b/csharp/src/IceDiscovery/Makefile.mak @@ -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/csharp/src/IceDiscovery/PluginI.cs b/csharp/src/IceDiscovery/PluginI.cs index 69e3a6c0667..2d78ec5f1cc 100644 --- a/csharp/src/IceDiscovery/PluginI.cs +++ b/csharp/src/IceDiscovery/PluginI.cs @@ -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. |