summaryrefslogtreecommitdiff
path: root/java/test/Ice/inheritance/Collocated.java
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2008-01-30 09:53:23 -0800
committerMark Spruiell <mes@zeroc.com>2008-01-30 09:53:23 -0800
commit9c0acda6b3e345a9d4c737f46c331c13c1ec3c2e (patch)
tree4c0dfab7c8915681f72dc82d9f2397dcd0c9b421 /java/test/Ice/inheritance/Collocated.java
parentMerge branch 'master' of ssh://cvs/home/git/ice (diff)
parentmerge from master; bug fixes (diff)
downloadice-9c0acda6b3e345a9d4c737f46c331c13c1ec3c2e.tar.bz2
ice-9c0acda6b3e345a9d4c737f46c331c13c1ec3c2e.tar.xz
ice-9c0acda6b3e345a9d4c737f46c331c13c1ec3c2e.zip
Merge branch 'bug1388'
Diffstat (limited to 'java/test/Ice/inheritance/Collocated.java')
0 files changed, 0 insertions, 0 deletions