Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 12194 for code/branches/mergeFS18/src/orxonox/controllers

Timestamp:

Feb 28, 2019, 12:56:53 PM (6 years ago)

Author:

merholzl

Message:

Merging OrxoKart

Location:

code/branches/mergeFS18

Files:

: 2 edited

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

Legend:

: Unmodified
: Added
: Removed

code/branches/mergeFS18

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,12192-12193

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

r12028	r12194
21	21	ArrowController.cc;
22	22	AutonomousDroneController.cc;
23
24	23	)

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

Download in other formats: