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/dispatcher | |
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/dispatcher')
-rw-r--r-- | cpp/test/Ice/dispatcher/AllTests.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/Collocated.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/Dispatcher.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/Dispatcher.h | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/Makefile | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/Server.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/Test.ice | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/TestI.cpp | 2 | ||||
-rw-r--r-- | cpp/test/Ice/dispatcher/TestI.h | 2 | ||||
-rwxr-xr-x | cpp/test/Ice/dispatcher/run.py | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/cpp/test/Ice/dispatcher/AllTests.cpp b/cpp/test/Ice/dispatcher/AllTests.cpp index e01d04ccc61..b4ec7f46bb0 100644 --- a/cpp/test/Ice/dispatcher/AllTests.cpp +++ b/cpp/test/Ice/dispatcher/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/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp index 117e3a089fc..3c4e1735e01 100644 --- a/cpp/test/Ice/dispatcher/Client.cpp +++ b/cpp/test/Ice/dispatcher/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/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp index 8ea09bc118c..59eb3490b94 100644 --- a/cpp/test/Ice/dispatcher/Collocated.cpp +++ b/cpp/test/Ice/dispatcher/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/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp index 32e6109e1d6..bbf991b0f65 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.cpp +++ b/cpp/test/Ice/dispatcher/Dispatcher.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/dispatcher/Dispatcher.h b/cpp/test/Ice/dispatcher/Dispatcher.h index d5573399301..40236236356 100644 --- a/cpp/test/Ice/dispatcher/Dispatcher.h +++ b/cpp/test/Ice/dispatcher/Dispatcher.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/dispatcher/Makefile b/cpp/test/Ice/dispatcher/Makefile index efec04e2282..bf914706aa2 100644 --- a/cpp/test/Ice/dispatcher/Makefile +++ b/cpp/test/Ice/dispatcher/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/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp index eb5750affd0..b8c51969db3 100644 --- a/cpp/test/Ice/dispatcher/Server.cpp +++ b/cpp/test/Ice/dispatcher/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/dispatcher/Test.ice b/cpp/test/Ice/dispatcher/Test.ice index 4234284aa66..517a190c82a 100644 --- a/cpp/test/Ice/dispatcher/Test.ice +++ b/cpp/test/Ice/dispatcher/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/dispatcher/TestI.cpp b/cpp/test/Ice/dispatcher/TestI.cpp index d99aae39f4c..7f4f6d458ea 100644 --- a/cpp/test/Ice/dispatcher/TestI.cpp +++ b/cpp/test/Ice/dispatcher/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/dispatcher/TestI.h b/cpp/test/Ice/dispatcher/TestI.h index b64aca8e681..c3161218c92 100644 --- a/cpp/test/Ice/dispatcher/TestI.h +++ b/cpp/test/Ice/dispatcher/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/dispatcher/run.py b/cpp/test/Ice/dispatcher/run.py index eb52f00447a..2d96b653cfa 100755 --- a/cpp/test/Ice/dispatcher/run.py +++ b/cpp/test/Ice/dispatcher/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. |