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/test/Ice/plugin | |
| 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/test/Ice/plugin')
| -rw-r--r-- | cpp/test/Ice/plugin/Client.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/plugin/Makefile | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/plugin/Plugin.cpp | 2 | ||||
| -rwxr-xr-x | cpp/test/Ice/plugin/run.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp index 6e7647b0c41..ffabb6e17ee 100644 --- a/cpp/test/Ice/plugin/Client.cpp +++ b/cpp/test/Ice/plugin/Client.cpp @@ -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/test/Ice/plugin/Makefile b/cpp/test/Ice/plugin/Makefile index a1ef79c559e..7510559b51e 100644 --- a/cpp/test/Ice/plugin/Makefile +++ b/cpp/test/Ice/plugin/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/cpp/test/Ice/plugin/Plugin.cpp b/cpp/test/Ice/plugin/Plugin.cpp index 0e5e60b2e21..2c1624ffe06 100644 --- a/cpp/test/Ice/plugin/Plugin.cpp +++ b/cpp/test/Ice/plugin/Plugin.cpp @@ -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/test/Ice/plugin/run.py b/cpp/test/Ice/plugin/run.py index ac2496acf58..4a57f94a040 100755 --- a/cpp/test/Ice/plugin/run.py +++ b/cpp/test/Ice/plugin/run.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# 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. |