diff options
| author | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
| commit | dc5678e6988bad79336033518f8f2378f7c34cb2 (patch) | |
| tree | f1b7d00d8bfde31297c4473d62ace3d05031b985 /python/test/Ice/objects | |
| parent | Connection wizard dialog becomes readonly (diff) | |
| parent | ICE-7506 - Update copyright to 2017 (diff) | |
| download | ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.bz2 ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.xz ice-dc5678e6988bad79336033518f8f2378f7c34cb2.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'python/test/Ice/objects')
| -rw-r--r-- | python/test/Ice/objects/AllTests.py | 2 | ||||
| -rwxr-xr-x | python/test/Ice/objects/Client.py | 2 | ||||
| -rw-r--r-- | python/test/Ice/objects/ClientPrivate.ice | 2 | ||||
| -rwxr-xr-x | python/test/Ice/objects/Collocated.py | 2 | ||||
| -rwxr-xr-x | python/test/Ice/objects/Server.py | 2 | ||||
| -rw-r--r-- | python/test/Ice/objects/ServerPrivate.ice | 2 | ||||
| -rw-r--r-- | python/test/Ice/objects/Test.ice | 2 | ||||
| -rw-r--r-- | python/test/Ice/objects/TestI.py | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/python/test/Ice/objects/AllTests.py b/python/test/Ice/objects/AllTests.py index 4137f79e1f9..7578f850ecf 100644 --- a/python/test/Ice/objects/AllTests.py +++ b/python/test/Ice/objects/AllTests.py @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2017 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/objects/Client.py b/python/test/Ice/objects/Client.py index 00d366ff9e3..eb34e04fc41 100755 --- a/python/test/Ice/objects/Client.py +++ b/python/test/Ice/objects/Client.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2017 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/objects/ClientPrivate.ice b/python/test/Ice/objects/ClientPrivate.ice index 3531f2864fe..719b6a4d8a2 100644 --- a/python/test/Ice/objects/ClientPrivate.ice +++ b/python/test/Ice/objects/ClientPrivate.ice @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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/objects/Collocated.py b/python/test/Ice/objects/Collocated.py index 8a9fd789eb8..845d56c4cea 100755 --- a/python/test/Ice/objects/Collocated.py +++ b/python/test/Ice/objects/Collocated.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2017 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/objects/Server.py b/python/test/Ice/objects/Server.py index 4810fefa5b9..b4352d82b5d 100755 --- a/python/test/Ice/objects/Server.py +++ b/python/test/Ice/objects/Server.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2017 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/objects/ServerPrivate.ice b/python/test/Ice/objects/ServerPrivate.ice index 084b4aa4f76..2b1a53ed18f 100644 --- a/python/test/Ice/objects/ServerPrivate.ice +++ b/python/test/Ice/objects/ServerPrivate.ice @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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/objects/Test.ice b/python/test/Ice/objects/Test.ice index 42f0a672cf2..8ddd5e1d4cc 100644 --- a/python/test/Ice/objects/Test.ice +++ b/python/test/Ice/objects/Test.ice @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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/objects/TestI.py b/python/test/Ice/objects/TestI.py index 178182137a4..f711157a741 100644 --- a/python/test/Ice/objects/TestI.py +++ b/python/test/Ice/objects/TestI.py @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2017 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. |