From cdcffbcc3c3c052afdeb772ff0167e7a90b525bb Mon Sep 17 00:00:00 2001 From: Mark Spruiell Date: Wed, 19 Mar 2014 12:45:55 -0700 Subject: merging javascript branch --- php/test/Ice/Makefile | 2 +- php/test/Ice/Makefile.mak | 2 +- php/test/Ice/binding/Client.php | 2 +- php/test/Ice/binding/Makefile | 2 +- php/test/Ice/binding/Makefile.mak | 2 +- php/test/Ice/binding/Test.ice | 2 +- php/test/Ice/binding/run.py | 2 +- php/test/Ice/checksum/CTypes.ice | 2 +- php/test/Ice/checksum/Client.php | 2 +- php/test/Ice/checksum/Makefile | 2 +- php/test/Ice/checksum/Makefile.mak | 2 +- php/test/Ice/checksum/Test.ice | 2 +- php/test/Ice/checksum/run.py | 2 +- php/test/Ice/defaultValue/Client.php | 2 +- php/test/Ice/defaultValue/Makefile | 2 +- php/test/Ice/defaultValue/Makefile.mak | 2 +- php/test/Ice/defaultValue/Test.ice | 2 +- php/test/Ice/defaultValue/run.py | 2 +- php/test/Ice/enums/Client.php | 2 +- php/test/Ice/enums/Makefile | 2 +- php/test/Ice/enums/Makefile.mak | 2 +- php/test/Ice/enums/Test.ice | 2 +- php/test/Ice/enums/run.py | 2 +- php/test/Ice/exceptions/Client.php | 2 +- php/test/Ice/exceptions/Makefile | 2 +- php/test/Ice/exceptions/Makefile.mak | 2 +- php/test/Ice/exceptions/Test.ice | 2 +- php/test/Ice/exceptions/run.py | 2 +- php/test/Ice/facets/Client.php | 2 +- php/test/Ice/facets/Makefile | 2 +- php/test/Ice/facets/Makefile.mak | 2 +- php/test/Ice/facets/Test.ice | 2 +- php/test/Ice/facets/run.py | 2 +- php/test/Ice/info/Client.php | 2 +- php/test/Ice/info/Makefile | 2 +- php/test/Ice/info/Makefile.mak | 2 +- php/test/Ice/info/Test.ice | 2 +- php/test/Ice/info/run.py | 2 +- php/test/Ice/inheritance/Client.php | 2 +- php/test/Ice/inheritance/Makefile | 2 +- php/test/Ice/inheritance/Makefile.mak | 2 +- php/test/Ice/inheritance/Test.ice | 2 +- php/test/Ice/inheritance/run.py | 2 +- php/test/Ice/ini/Client.php | 2 +- php/test/Ice/ini/ClientWithProfile.php | 2 +- php/test/Ice/ini/run.py | 2 +- php/test/Ice/objects/Client.php | 2 +- php/test/Ice/objects/Makefile | 2 +- php/test/Ice/objects/Makefile.mak | 2 +- php/test/Ice/objects/Test.ice | 2 +- php/test/Ice/objects/run.py | 2 +- php/test/Ice/operations/Client.php | 2 +- php/test/Ice/operations/Makefile | 2 +- php/test/Ice/operations/Makefile.mak | 2 +- php/test/Ice/operations/Test.ice | 2 +- php/test/Ice/operations/run.py | 2 +- php/test/Ice/optional/Client.php | 2 +- php/test/Ice/optional/ClientPrivate.ice | 2 +- php/test/Ice/optional/Makefile | 2 +- php/test/Ice/optional/Makefile.mak | 2 +- php/test/Ice/optional/Test.ice | 2 +- php/test/Ice/optional/run.py | 2 +- php/test/Ice/proxy/Client.php | 2 +- php/test/Ice/proxy/Makefile | 2 +- php/test/Ice/proxy/Makefile.mak | 2 +- php/test/Ice/proxy/Test.ice | 2 +- php/test/Ice/proxy/run.py | 2 +- php/test/Ice/scope/Client.php | 2 +- php/test/Ice/scope/run.py | 2 +- php/test/Ice/slicing/Makefile | 2 +- php/test/Ice/slicing/Makefile.mak | 2 +- php/test/Ice/slicing/exceptions/Makefile | 2 +- php/test/Ice/slicing/exceptions/Makefile.mak | 2 +- php/test/Ice/slicing/exceptions/Test.ice | 2 +- php/test/Ice/slicing/exceptions/run.py | 2 +- php/test/Ice/slicing/objects/ClientPrivate.ice | 2 +- php/test/Ice/slicing/objects/Forward.ice | 2 +- php/test/Ice/slicing/objects/Makefile | 2 +- php/test/Ice/slicing/objects/Makefile.mak | 2 +- php/test/Ice/slicing/objects/Test.ice | 2 +- php/test/Ice/slicing/objects/run.py | 2 +- php/test/Makefile | 2 +- php/test/Makefile.mak | 2 +- php/test/Slice/Makefile | 2 +- php/test/Slice/Makefile.mak | 2 +- php/test/Slice/keyword/Client.php | 2 +- php/test/Slice/keyword/Key.ice | 2 +- php/test/Slice/keyword/Makefile | 2 +- php/test/Slice/keyword/Makefile.mak | 2 +- php/test/Slice/keyword/run.py | 2 +- php/test/Slice/macros/Client.php | 2 +- php/test/Slice/macros/Makefile | 2 +- php/test/Slice/macros/Makefile.mak | 2 +- php/test/Slice/macros/Test.ice | 2 +- php/test/Slice/macros/run.py | 2 +- php/test/Slice/structure/Client.php | 2 +- php/test/Slice/structure/Makefile | 2 +- php/test/Slice/structure/Makefile.mak | 2 +- php/test/Slice/structure/Test.ice | 2 +- php/test/Slice/structure/run.py | 2 +- 100 files changed, 100 insertions(+), 100 deletions(-) (limited to 'php/test') diff --git a/php/test/Ice/Makefile b/php/test/Ice/Makefile index e3a17053b86..0bb52fa6bd6 100644 --- a/php/test/Ice/Makefile +++ b/php/test/Ice/Makefile @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 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/Makefile.mak b/php/test/Ice/Makefile.mak index 3134cc794cd..79d129811ea 100644 --- a/php/test/Ice/Makefile.mak +++ b/php/test/Ice/Makefile.mak @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 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/binding/Client.php b/php/test/Ice/binding/Client.php index 6e22c7955f5..1bfd28c52e6 100644 --- a/php/test/Ice/binding/Client.php +++ b/php/test/Ice/binding/Client.php @@ -1,7 +1,7 @@