diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-25 11:59:02 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-25 11:59:02 +0200 |
| commit | 981759144e754de8150e940ce7de89e6e769660d (patch) | |
| tree | 15154080af508ffa5b3c02c948e636384c84f93a /cpp/src/Ice/DefaultsAndOverrides.cpp | |
| parent | Java test and bug fixes (diff) | |
| parent | Removed bogus sl/chat/bin directory (diff) | |
| download | ice-981759144e754de8150e940ce7de89e6e769660d.tar.bz2 ice-981759144e754de8150e940ce7de89e6e769660d.tar.xz ice-981759144e754de8150e940ce7de89e6e769660d.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Diffstat (limited to 'cpp/src/Ice/DefaultsAndOverrides.cpp')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index fc74b714316..5a6a2a1a589 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2012 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. |