diff options
author | Jose <jose@zeroc.com> | 2019-07-09 17:28:56 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2019-07-09 17:28:56 +0200 |
commit | 9bb1f40c2149edadcfc24892635b1f36d649cc6f (patch) | |
tree | b7bf38fb444a3a4a1eef23bb998ec065953f5ff3 /python/test/Ice/objects/Collocated.py | |
parent | Fix ice.xcodeproj path issue (diff) | |
parent | Remove forward declarations limitation - Close #97 (diff) | |
download | ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.tar.bz2 ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.tar.xz ice-9bb1f40c2149edadcfc24892635b1f36d649cc6f.zip |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'python/test/Ice/objects/Collocated.py')
-rwxr-xr-x | python/test/Ice/objects/Collocated.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/test/Ice/objects/Collocated.py b/python/test/Ice/objects/Collocated.py index ada3bc0d82b..ba6d78fd96e 100755 --- a/python/test/Ice/objects/Collocated.py +++ b/python/test/Ice/objects/Collocated.py @@ -4,7 +4,7 @@ # from TestHelper import TestHelper -TestHelper.loadSlice("Test.ice ClientPrivate.ice") +TestHelper.loadSlice("Test.ice Forward.ice ClientPrivate.ice") import Ice import TestI import AllTests |