Changeset 8478 in orxonox.OLD for branches/atmospheric_engine/src
- Timestamp:
- Jun 15, 2006, 4:24:48 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/atmospheric_engine/src/lib/collision_reaction/collision_handle.cc
r8474 r8478 1 1 /* 2 orxonox - the future of 3D-vertical-scrollers 2 orxonox - the future of 3D-vertical-scrollersf 3 3 4 4 Copyright (C) 2004 orx … … 92 92 return; 93 93 94 <<<<<<< .mine 95 // add element 96 //PRINTF(0)("addTarget: %i \n", target); 97 ======= 94 98 // add element 95 99 //PRINTF(0)("addTarget: %i \n", target); 100 >>>>>>> .r8477 96 101 this->targetList.push_back(target); 97 102 }
Note: See TracChangeset
for help on using the changeset viewer.