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 /cpp/src/IceLocatorDiscovery/PluginI.h | |
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 'cpp/src/IceLocatorDiscovery/PluginI.h')
-rw-r--r-- | cpp/src/IceLocatorDiscovery/PluginI.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceLocatorDiscovery/PluginI.h b/cpp/src/IceLocatorDiscovery/PluginI.h index a13aaff4b94..d882f3f3690 100644 --- a/cpp/src/IceLocatorDiscovery/PluginI.h +++ b/cpp/src/IceLocatorDiscovery/PluginI.h @@ -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. |