Changeset 8480 in orxonox.OLD for branches/atmospheric_engine/src/lib/collision_reaction/collision_handle.cc

Timestamp:

Jun 15, 2006, 4:57:51 PM (18 years ago)

Author:

amaechler

Message:

sound fixed

File:

• branches/atmospheric_engine/src/lib/collision_reaction/collision_handle.cc (modified) (1 diff)

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

@@ -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);
 }