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 /cpp/src/slice2confluence | |
| 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 'cpp/src/slice2confluence')
| -rw-r--r-- | cpp/src/slice2confluence/Gen.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Gen.h | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Main.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Slice2Confluence.rc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index 91ae7a4e99a..6d1de56ccd4 100644 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -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/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h index c1c0c21b878..e8681149dcd 100644 --- a/cpp/src/slice2confluence/Gen.h +++ b/cpp/src/slice2confluence/Gen.h @@ -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/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp index b6eda9517d4..634bc1713ab 100644 --- a/cpp/src/slice2confluence/Main.cpp +++ b/cpp/src/slice2confluence/Main.cpp @@ -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/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile index 97a3430995f..26dd95146f5 100644 --- a/cpp/src/slice2confluence/Makefile +++ b/cpp/src/slice2confluence/Makefile @@ -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/cpp/src/slice2confluence/Makefile.mak b/cpp/src/slice2confluence/Makefile.mak index f80acc45694..9fbf836d71a 100644 --- a/cpp/src/slice2confluence/Makefile.mak +++ b/cpp/src/slice2confluence/Makefile.mak @@ -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/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index 91e288db989..e76e2bed9b5 100644 --- a/cpp/src/slice2confluence/Slice2Confluence.rc +++ b/cpp/src/slice2confluence/Slice2Confluence.rc @@ -21,7 +21,7 @@ BEGIN VALUE "FileDescription", "Slice To Confluence Markup Translator\0" VALUE "FileVersion", "3.5.1\0" VALUE "InternalName", "slice2confluence\0" - VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.\0" + VALUE "LegalCopyright", "Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\0" VALUE "OriginalFilename", "slice2confluence.exe\0" VALUE "ProductName", "Ice\0" VALUE "ProductVersion", "3.5.1\0" |