Context Navigation

worldentities

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

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/src/orxonox/objects/worldentities/Backlight.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.h
- Property svn:mergeinfo changed (with no actual effect on merging)

-                      r2662
+                      r2664
 SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   WorldEntity.cc
   StaticEntity.cc
 …
+)
+ADD_SOURCE_DIRECTORY(SRC_FILES pawns)
+ADD_SOURCE_DIRECTORY(SRC_FILES triggers)
+ADD_SOURCE_FILES(SRC_FILES)
+ADD_SUBDIRECTORY(pawns)
+ADD_SUBDIRECTORY(triggers)

code/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.h
- Property svn:mergeinfo changed (with no actual effect on merging)

-                      r2131
+                      r2664
 SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Spectator.cc
   Pawn.cc
   SpaceShip.cc
+)
-ADD_SOURCE_FILES(SRC_FILES)

-                      r2261
+                      r2664
 SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Trigger.cc
   DistanceTrigger.cc
 …
   PlayerTrigger.cc
+)
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.h
- Property svn:mergeinfo changed (with no actual effect on merging)

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