Changeset 8478 in orxonox.OLD

Timestamp:

Jun 15, 2006, 4:24:48 PM (18 years ago)

Author:

amaechler

Message:

at: soundloops broken, counter push

File:

• branches/atmospheric_engine/src/lib/collision_reaction/collision_handle.cc (modified) (2 diffs)

branches/atmospheric_engine/src/lib/collision_reaction/collision_handle.cc

@@ -1 +1 @@
 /*
-   orxonox - the future of 3D-vertical-scrollers
+   orxonox - the future of 3D-vertical-scrollersf
 
    Copyright (C) 2004 orx
@@ -92 +92 @@
       return;
 
+<<<<<<< .mine
+   // add element
+   //PRINTF(0)("addTarget: %i \n", target);
+=======
   // add element
    //PRINTF(0)("addTarget: %i \n", target);
+>>>>>>> .r8477
    this->targetList.push_back(target);
 }