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 /js/test/Ice/proxy | |
| 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 'js/test/Ice/proxy')
| -rw-r--r-- | js/test/Ice/proxy/Client.js | 2 | ||||
| -rw-r--r-- | js/test/Ice/proxy/Test.ice | 2 | ||||
| -rw-r--r-- | js/test/Ice/proxy/run.js | 2 | ||||
| -rwxr-xr-x | js/test/Ice/proxy/run.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js index 073a838c01f..b3fcee3ff5d 100644 --- a/js/test/Ice/proxy/Client.js +++ b/js/test/Ice/proxy/Client.js @@ -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/js/test/Ice/proxy/Test.ice b/js/test/Ice/proxy/Test.ice index 7f3701e81e2..239c473918a 100644 --- a/js/test/Ice/proxy/Test.ice +++ b/js/test/Ice/proxy/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/js/test/Ice/proxy/run.js b/js/test/Ice/proxy/run.js index 7c2ffdcdd61..fc8c9a16e7c 100644 --- a/js/test/Ice/proxy/run.js +++ b/js/test/Ice/proxy/run.js @@ -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/js/test/Ice/proxy/run.py b/js/test/Ice/proxy/run.py index eba34203914..9a426f0bb1e 100755 --- a/js/test/Ice/proxy/run.py +++ b/js/test/Ice/proxy/run.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ********************************************************************** # -# 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. |