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/android/library/slice | |
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/android/library/slice')
-rw-r--r-- | java/demo/android/library/slice/Glacier2Session.ice | 2 | ||||
-rw-r--r-- | java/demo/android/library/slice/Library.ice | 2 | ||||
-rw-r--r-- | java/demo/android/library/slice/Session.ice | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/java/demo/android/library/slice/Glacier2Session.ice b/java/demo/android/library/slice/Glacier2Session.ice index a7d81d9a9a8..b35b7771713 100644 --- a/java/demo/android/library/slice/Glacier2Session.ice +++ b/java/demo/android/library/slice/Glacier2Session.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/android/library/slice/Library.ice b/java/demo/android/library/slice/Library.ice index 2cccc33d09e..895dc761928 100644 --- a/java/demo/android/library/slice/Library.ice +++ b/java/demo/android/library/slice/Library.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/android/library/slice/Session.ice b/java/demo/android/library/slice/Session.ice index acd19aa266c..93010c217ee 100644 --- a/java/demo/android/library/slice/Session.ice +++ b/java/demo/android/library/slice/Session.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. |