diff options
author | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
commit | cdcffbcc3c3c052afdeb772ff0167e7a90b525bb (patch) | |
tree | 4f16ee41ef7d33394c44e9db81e4d6cd89908250 /py/demo/IceGrid | |
parent | fixing testicedist.py for 5487 (diff) | |
download | ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2 ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip |
merging javascript branch
Diffstat (limited to 'py/demo/IceGrid')
-rwxr-xr-x | py/demo/IceGrid/simple/Client.py | 2 | ||||
-rw-r--r-- | py/demo/IceGrid/simple/Hello.ice | 2 | ||||
-rwxr-xr-x | py/demo/IceGrid/simple/Server.py | 2 | ||||
-rw-r--r-- | py/demo/IceGrid/simple/application.xml | 2 | ||||
-rw-r--r-- | py/demo/IceGrid/simple/application_with_replication.xml | 2 | ||||
-rw-r--r-- | py/demo/IceGrid/simple/application_with_template.xml | 2 | ||||
-rwxr-xr-x | py/demo/IceGrid/simple/expect.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/py/demo/IceGrid/simple/Client.py b/py/demo/IceGrid/simple/Client.py index fb446c12d9c..a21e4eeb566 100755 --- a/py/demo/IceGrid/simple/Client.py +++ b/py/demo/IceGrid/simple/Client.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 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/py/demo/IceGrid/simple/Hello.ice b/py/demo/IceGrid/simple/Hello.ice index 4859970f6a1..617d061e087 100644 --- a/py/demo/IceGrid/simple/Hello.ice +++ b/py/demo/IceGrid/simple/Hello.ice @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/py/demo/IceGrid/simple/Server.py b/py/demo/IceGrid/simple/Server.py index 61012a66512..ae238f4737c 100755 --- a/py/demo/IceGrid/simple/Server.py +++ b/py/demo/IceGrid/simple/Server.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 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/py/demo/IceGrid/simple/application.xml b/py/demo/IceGrid/simple/application.xml index e2fdb1248d0..78629a282f7 100644 --- a/py/demo/IceGrid/simple/application.xml +++ b/py/demo/IceGrid/simple/application.xml @@ -1,7 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. + Copyright (c) 2003-2014 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/py/demo/IceGrid/simple/application_with_replication.xml b/py/demo/IceGrid/simple/application_with_replication.xml index c38ef57a23d..b30d7fc9c54 100644 --- a/py/demo/IceGrid/simple/application_with_replication.xml +++ b/py/demo/IceGrid/simple/application_with_replication.xml @@ -1,7 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. + Copyright (c) 2003-2014 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/py/demo/IceGrid/simple/application_with_template.xml b/py/demo/IceGrid/simple/application_with_template.xml index ebb6bb0a3d8..3d9211158bc 100644 --- a/py/demo/IceGrid/simple/application_with_template.xml +++ b/py/demo/IceGrid/simple/application_with_template.xml @@ -1,7 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. + Copyright (c) 2003-2014 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/py/demo/IceGrid/simple/expect.py b/py/demo/IceGrid/simple/expect.py index e34e90aa757..766f56a24ce 100755 --- a/py/demo/IceGrid/simple/expect.py +++ b/py/demo/IceGrid/simple/expect.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 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. |