Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 12185 for code/branches/Merge_HS18/src/orxonox

Timestamp:

Dec 11, 2018, 7:38:06 PM (6 years ago)

Author:

merholzl

Message:

OrxoKart merge

Location:

code/branches/Merge_HS18

Files:

: 2 edited

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

Legend:

: Unmodified
: Added
: Removed

code/branches/Merge_HS18

Property svn:mergeinfo changed

/code/branches/OrxoKart_HS18 (added)

merged: 12037,12056-12057,12062,12065-12066,12070-12071,12073-12074,12079,12081-12082,12089-12090,12108,12111,12116,12128,12138-12139,12142,12144,12146-12148,12154-12156,12167-12168

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

r12180	r12185
24	24	AutonomousDroneController.cc;
25	25	StoryModeController.cc;
26
27	26	)

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

Download in other formats: