[go: up one dir, main page]
Menu ▾ ▴

Commit [r12705]  Maximize  Restore  History

Merging with safemode branch -r12704, see log from that rev. Merge required for unitcollection and cmake fixes prior to non-mergable physics work

safemode 2010-03-12

Browse code at this revision

Parent: [r12704]

Child: [r12706]

changed /trunk/vegastrike
changed /trunk/vegastrike/CMakeLists.txt
changed /trunk/vegastrike/FindPNG.cmake
changed /trunk/vegastrike/src/cmd/collection.cpp
changed /trunk/vegastrike/src/cmd/collection.h
changed /trunk/vegastrike/src/cmd/collide2/CSopcodecollider.cpp
changed /trunk/vegastrike/src/cmd/unit_collide.cpp
changed /trunk/vegastrike/src/cmd/unit_generic.h
changed /trunk/vegastrike/src/star_system_generic.cpp
/trunk/vegastrike
Directory.
/trunk/vegastrike/CMakeLists.txt Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/FindPNG.cmake Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/src/cmd/collection.cpp Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/src/cmd/collection.h Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/src/cmd/collide2/CSopcodecollider.cpp Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/src/cmd/unit_collide.cpp Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/src/cmd/unit_generic.h Diff Switch to side-by-side view
Loading...
/trunk/vegastrike/src/star_system_generic.cpp Diff Switch to side-by-side view
Loading...