diff options
| author | Jose <jose@zeroc.com> | 2016-03-10 23:48:38 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-10 23:48:38 +0100 |
| commit | 71c75b16f3d7a0bf4888420c7d24219217615e7f (patch) | |
| tree | cc26d4f07203264dd610659529ae4d69da40bfe9 /cpp/test/Ice/operations/TestI.cpp | |
| parent | C# doc comment fix (diff) | |
| parent | Windows wide string literal fixes (diff) | |
| download | ice-71c75b16f3d7a0bf4888420c7d24219217615e7f.tar.bz2 ice-71c75b16f3d7a0bf4888420c7d24219217615e7f.tar.xz ice-71c75b16f3d7a0bf4888420c7d24219217615e7f.zip | |
Merge branch '3.6'
Diffstat (limited to 'cpp/test/Ice/operations/TestI.cpp')
| -rw-r--r-- | cpp/test/Ice/operations/TestI.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index 48c0153b5b9..391f991feb8 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -844,4 +844,3 @@ MyDerivedClassI::opWStringLiterals(const Ice::Current&) return data; } - |