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/facets | |
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/facets')
-rw-r--r-- | python/test/Ice/facets/AllTests.py | 2 | ||||
-rwxr-xr-x | python/test/Ice/facets/Client.py | 2 | ||||
-rwxr-xr-x | python/test/Ice/facets/Collocated.py | 2 | ||||
-rwxr-xr-x | python/test/Ice/facets/Server.py | 2 | ||||
-rw-r--r-- | python/test/Ice/facets/Test.ice | 2 | ||||
-rw-r--r-- | python/test/Ice/facets/TestI.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/python/test/Ice/facets/AllTests.py b/python/test/Ice/facets/AllTests.py index 97a6fd34e53..b9fcba386dd 100644 --- a/python/test/Ice/facets/AllTests.py +++ b/python/test/Ice/facets/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/facets/Client.py b/python/test/Ice/facets/Client.py index cf0d5394643..86807cecb5d 100755 --- a/python/test/Ice/facets/Client.py +++ b/python/test/Ice/facets/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/facets/Collocated.py b/python/test/Ice/facets/Collocated.py index 47844d24114..f336384b0ea 100755 --- a/python/test/Ice/facets/Collocated.py +++ b/python/test/Ice/facets/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/facets/Server.py b/python/test/Ice/facets/Server.py index 89871e1feb5..846e724f4a2 100755 --- a/python/test/Ice/facets/Server.py +++ b/python/test/Ice/facets/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/facets/Test.ice b/python/test/Ice/facets/Test.ice index 1d2c7c3c26e..195bbe5e1a0 100644 --- a/python/test/Ice/facets/Test.ice +++ b/python/test/Ice/facets/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/facets/TestI.py b/python/test/Ice/facets/TestI.py index de1a73f4b6e..c3bcfe20042 100644 --- a/python/test/Ice/facets/TestI.py +++ b/python/test/Ice/facets/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. |