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/include/IcePatch2 | |
| 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/include/IcePatch2')
| -rw-r--r-- | cpp/include/IcePatch2/ClientUtil.h | 2 | ||||
| -rw-r--r-- | cpp/include/IcePatch2/Config.h | 2 | ||||
| -rw-r--r-- | cpp/include/IcePatch2/IcePatch2.h | 2 | ||||
| -rw-r--r-- | cpp/include/IcePatch2/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h index b8739aff9ff..a741b3af269 100644 --- a/cpp/include/IcePatch2/ClientUtil.h +++ b/cpp/include/IcePatch2/ClientUtil.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. diff --git a/cpp/include/IcePatch2/Config.h b/cpp/include/IcePatch2/Config.h index d333b21de71..f9b2c8855ee 100644 --- a/cpp/include/IcePatch2/Config.h +++ b/cpp/include/IcePatch2/Config.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. diff --git a/cpp/include/IcePatch2/IcePatch2.h b/cpp/include/IcePatch2/IcePatch2.h index 53826404ec4..3c3f7e7f1ad 100644 --- a/cpp/include/IcePatch2/IcePatch2.h +++ b/cpp/include/IcePatch2/IcePatch2.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. diff --git a/cpp/include/IcePatch2/Makefile b/cpp/include/IcePatch2/Makefile index c135db1396b..5d85292b110 100644 --- a/cpp/include/IcePatch2/Makefile +++ b/cpp/include/IcePatch2/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. |