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/objects | |
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/objects')
-rw-r--r-- | cpp/test/Ice/objects/AllTests.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/Collocated.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/Derived.ice | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/DerivedEx.ice | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/Makefile | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/Server.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/Test.ice | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/TestI.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/TestI.h | 2 | ||||
-rw-r--r-- | cpp/test/Ice/objects/TestIntfI.cpp | 2 | ||||
-rwxr-xr-x | cpp/test/Ice/objects/run.py | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index 20ec8d28eaa..77a4e746849 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.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/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index 21356269801..bceb4001e3a 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/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/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 1c07718968d..9686c6ca559 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.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/objects/Derived.ice b/cpp/test/Ice/objects/Derived.ice index e54a7dcbc59..be44e45cb29 100644 --- a/cpp/test/Ice/objects/Derived.ice +++ b/cpp/test/Ice/objects/Derived.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/cpp/test/Ice/objects/DerivedEx.ice b/cpp/test/Ice/objects/DerivedEx.ice index 0f8b6ea0a16..2eebb440c39 100644 --- a/cpp/test/Ice/objects/DerivedEx.ice +++ b/cpp/test/Ice/objects/DerivedEx.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/cpp/test/Ice/objects/Makefile b/cpp/test/Ice/objects/Makefile index da505bcd000..57858203006 100644 --- a/cpp/test/Ice/objects/Makefile +++ b/cpp/test/Ice/objects/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/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index c5c4e61849d..47ef551c54f 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.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/objects/Test.ice b/cpp/test/Ice/objects/Test.ice index 860597fb69c..a84a62ecfad 100644 --- a/cpp/test/Ice/objects/Test.ice +++ b/cpp/test/Ice/objects/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/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index 355c27fcf99..042cbb1b83a 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.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/objects/TestI.h b/cpp/test/Ice/objects/TestI.h index 8a3ff457be2..7fd7fff9e65 100644 --- a/cpp/test/Ice/objects/TestI.h +++ b/cpp/test/Ice/objects/TestI.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/test/Ice/objects/TestIntfI.cpp b/cpp/test/Ice/objects/TestIntfI.cpp index 9761f9e0477..86e206e4b36 100644 --- a/cpp/test/Ice/objects/TestIntfI.cpp +++ b/cpp/test/Ice/objects/TestIntfI.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/objects/run.py b/cpp/test/Ice/objects/run.py index bb0c4f5e11e..bd13835d1c7 100755 --- a/cpp/test/Ice/objects/run.py +++ b/cpp/test/Ice/objects/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. |