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/IceGrid/session | |
| 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/IceGrid/session')
| -rw-r--r-- | cpp/test/IceGrid/session/AllTests.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/Client.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/Makefile | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/PermissionsVerifier.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/Server.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/Test.ice | 2 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/session/run.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 6363aa93252..bdd080a9ea0 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/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/IceGrid/session/Client.cpp b/cpp/test/IceGrid/session/Client.cpp index b812e04c345..4105cbaaaf7 100644 --- a/cpp/test/IceGrid/session/Client.cpp +++ b/cpp/test/IceGrid/session/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/IceGrid/session/Makefile b/cpp/test/IceGrid/session/Makefile index 9fcd6858cc5..570cc59c394 100644 --- a/cpp/test/IceGrid/session/Makefile +++ b/cpp/test/IceGrid/session/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/IceGrid/session/PermissionsVerifier.cpp b/cpp/test/IceGrid/session/PermissionsVerifier.cpp index 7c2eb53f5d8..f2971f5309d 100644 --- a/cpp/test/IceGrid/session/PermissionsVerifier.cpp +++ b/cpp/test/IceGrid/session/PermissionsVerifier.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/IceGrid/session/Server.cpp b/cpp/test/IceGrid/session/Server.cpp index cc8d6b137ab..86abe1afd38 100644 --- a/cpp/test/IceGrid/session/Server.cpp +++ b/cpp/test/IceGrid/session/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/IceGrid/session/Test.ice b/cpp/test/IceGrid/session/Test.ice index bb6e734ef1f..ba2182b4a42 100644 --- a/cpp/test/IceGrid/session/Test.ice +++ b/cpp/test/IceGrid/session/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/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index 098974fe19f..0ff6d646f51 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/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. |