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 /java/demo/Ice/nested | |
| 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 'java/demo/Ice/nested')
| -rw-r--r-- | java/demo/Ice/nested/Client.java | 2 | ||||
| -rw-r--r-- | java/demo/Ice/nested/Nested.ice | 2 | ||||
| -rw-r--r-- | java/demo/Ice/nested/NestedI.java | 2 | ||||
| -rw-r--r-- | java/demo/Ice/nested/Server.java | 2 | ||||
| -rw-r--r-- | java/demo/Ice/nested/build.xml | 2 | ||||
| -rwxr-xr-x | java/demo/Ice/nested/expect.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java index 412111582c9..0698ac16237 100644 --- a/java/demo/Ice/nested/Client.java +++ b/java/demo/Ice/nested/Client.java @@ -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/java/demo/Ice/nested/Nested.ice b/java/demo/Ice/nested/Nested.ice index 35488648614..861c91a89ce 100644 --- a/java/demo/Ice/nested/Nested.ice +++ b/java/demo/Ice/nested/Nested.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/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java index f55376bb7cb..4dc087d18c7 100644 --- a/java/demo/Ice/nested/NestedI.java +++ b/java/demo/Ice/nested/NestedI.java @@ -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/java/demo/Ice/nested/Server.java b/java/demo/Ice/nested/Server.java index 89981af20db..2ccead73772 100644 --- a/java/demo/Ice/nested/Server.java +++ b/java/demo/Ice/nested/Server.java @@ -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/java/demo/Ice/nested/build.xml b/java/demo/Ice/nested/build.xml index b558f9edcf4..d7c71dddb33 100644 --- a/java/demo/Ice/nested/build.xml +++ b/java/demo/Ice/nested/build.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/java/demo/Ice/nested/expect.py b/java/demo/Ice/nested/expect.py index 6fcad261440..4793e6457ec 100755 --- a/java/demo/Ice/nested/expect.py +++ b/java/demo/Ice/nested/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. |