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 /php/test/Ice/inheritance | |
| 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 'php/test/Ice/inheritance')
| -rw-r--r-- | php/test/Ice/inheritance/Client.php | 2 | ||||
| -rw-r--r-- | php/test/Ice/inheritance/Makefile | 2 | ||||
| -rw-r--r-- | php/test/Ice/inheritance/Test.ice | 2 | ||||
| -rwxr-xr-x | php/test/Ice/inheritance/run.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/php/test/Ice/inheritance/Client.php b/php/test/Ice/inheritance/Client.php index d2e4f017c05..33c82f8bb6b 100644 --- a/php/test/Ice/inheritance/Client.php +++ b/php/test/Ice/inheritance/Client.php @@ -1,7 +1,7 @@ <? // ********************************************************************** // -// 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/php/test/Ice/inheritance/Makefile b/php/test/Ice/inheritance/Makefile index 46857bd3954..c837988f0db 100644 --- a/php/test/Ice/inheritance/Makefile +++ b/php/test/Ice/inheritance/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/php/test/Ice/inheritance/Test.ice b/php/test/Ice/inheritance/Test.ice index 7dd63ee98b6..2e9b176c00b 100644 --- a/php/test/Ice/inheritance/Test.ice +++ b/php/test/Ice/inheritance/Test.ice @@ -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/php/test/Ice/inheritance/run.py b/php/test/Ice/inheritance/run.py index 74d2e5d1724..3fc6200cd00 100755 --- a/php/test/Ice/inheritance/run.py +++ b/php/test/Ice/inheritance/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. |