Context Navigation

← Previous Change
Next Change →

collisionshapes

Timestamp:

Feb 28, 2009, 7:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.

Location:

code/trunk

Files:

: 3 edited

. (modified) (2 props)
src/orxonox/objects/collisionshapes (modified) (1 prop)
src/orxonox/objects/collisionshapes/CMakeLists.txt (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

code/trunk

Property svn:ignore deleted

Property svn:mergeinfo changed

/code/branches/buildsystem (added)	merged: 1875,1882-1886,1975-1982,1991,1999,2054,2061,2135,2137-2139,2197-2199,2204,2214-2220,2223-2224,2229,2233-2244,2248-2249,2252-2253,2260,2275,2278-2279,2318,2322,2325-2326,2335-2336,2338-2339,2359-2360,2384,2392,2399
/code/branches/buildsystem2 (added)	merged: 2507,2509-2512,2516-2526,2534,2546-2547,2566-2570,2572-2574,2576-2577,2579-2652,2654,2656-2658
/code/branches/buildsystem3 (added)	merged: 2663-2668,2670-2680,2682-2708

code/trunk/src/orxonox/objects/collisionshapes
- Property svn:mergeinfo changed
  /code/branches/buildsystem3/src/orxonox/objects/collisionshapes (added) merged: 2665

code/trunk/src/orxonox/objects/collisionshapes/CMakeLists.txt

-                      r2662
+                      r2710
 SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BoxCollisionShape.cc
   CollisionShape.cc
 …
   WorldEntityCollisionShape.cc
+)
-ADD_SOURCE_FILES(SRC_FILES)

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 2710 for code/trunk/src/orxonox/objects/collisionshapes

Legend:

code/trunk

code/trunk/src/orxonox/objects/collisionshapes

code/trunk/src/orxonox/objects/collisionshapes/CMakeLists.txt

Download in other formats: