Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 10834 for code/branches/campaignHS15/src/orxonox/controllers/CMakeLists.txt

Timestamp:

Nov 23, 2015, 1:24:51 PM (10 years ago)

Author:

maxima

Message:

AI_HS15 merged into campaignHS15

Location:

code/branches/campaignHS15

Files:

: 2 edited

. (modified) (1 prop)
src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/branches/campaignHS15

Property svn:mergeinfo changed

/code/branches/AI_HS15 (added)

merged: 10640,10651-10652,10654-10655,10670,10673,10678-10679,10681-10682,10709,10717-10719,10722,10725,10729,10731,10737,10759,10761-10764,10780,10782,10789,10793,10796-10800,10803,10805,10826-10827,10832

code/branches/campaignHS15/src/orxonox/controllers/CMakeLists.txt

-                      r10216
+                      r10834
   FormationController.cc
   ControllerDirector.cc
+  DivisionController.cc
+  LeaderController.cc
+  WingmanController.cc
+  SectionController.cc
+  CommonController.cc
+)

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

Download in other formats: