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 /scripts | |
| 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 'scripts')
| -rwxr-xr-x | scripts/Expect.py | 2 | ||||
| -rw-r--r-- | scripts/IceStormUtil.py | 2 | ||||
| -rw-r--r-- | scripts/NetworkProxy.py | 2 | ||||
| -rw-r--r-- | scripts/__init__.py | 2 | ||||
| -rw-r--r-- | scripts/icehashpassword.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py index 05d768befab..aacaf80258e 100755 --- a/scripts/Expect.py +++ b/scripts/Expect.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/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index dc903ce578c..47a08cbe3da 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.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/scripts/NetworkProxy.py b/scripts/NetworkProxy.py index 0ee9cc416e4..464c80580be 100644 --- a/scripts/NetworkProxy.py +++ b/scripts/NetworkProxy.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/scripts/__init__.py b/scripts/__init__.py index 90d182d1c05..370705976e6 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.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/scripts/icehashpassword.py b/scripts/icehashpassword.py index 28dcd8bf9a1..9a0a6e138d1 100644 --- a/scripts/icehashpassword.py +++ b/scripts/icehashpassword.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. |