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 /python/test/Ice/admin | |
| 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 'python/test/Ice/admin')
| -rw-r--r-- | python/test/Ice/admin/AllTests.py | 2 | ||||
| -rw-r--r-- | python/test/Ice/admin/Client.py | 2 | ||||
| -rw-r--r-- | python/test/Ice/admin/Server.py | 2 | ||||
| -rw-r--r-- | python/test/Ice/admin/Test.ice | 2 | ||||
| -rw-r--r-- | python/test/Ice/admin/TestI.py | 2 | ||||
| -rwxr-xr-x | python/test/Ice/admin/run.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/python/test/Ice/admin/AllTests.py b/python/test/Ice/admin/AllTests.py index c76a7d65325..e6ee6e196e0 100644 --- a/python/test/Ice/admin/AllTests.py +++ b/python/test/Ice/admin/AllTests.py @@ -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/python/test/Ice/admin/Client.py b/python/test/Ice/admin/Client.py index 9a4a8071b56..04d5e65ea29 100644 --- a/python/test/Ice/admin/Client.py +++ b/python/test/Ice/admin/Client.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. diff --git a/python/test/Ice/admin/Server.py b/python/test/Ice/admin/Server.py index a310310cc19..a28da94e27d 100644 --- a/python/test/Ice/admin/Server.py +++ b/python/test/Ice/admin/Server.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. diff --git a/python/test/Ice/admin/Test.ice b/python/test/Ice/admin/Test.ice index 92d1cf94e49..3f896b414df 100644 --- a/python/test/Ice/admin/Test.ice +++ b/python/test/Ice/admin/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/python/test/Ice/admin/TestI.py b/python/test/Ice/admin/TestI.py index f1f6f8880ea..f1e6e0b49d5 100644 --- a/python/test/Ice/admin/TestI.py +++ b/python/test/Ice/admin/TestI.py @@ -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/python/test/Ice/admin/run.py b/python/test/Ice/admin/run.py index 74d2e5d1724..3fc6200cd00 100755 --- a/python/test/Ice/admin/run.py +++ b/python/test/Ice/admin/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. |