Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 11690 for code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt

Timestamp:

Dec 18, 2017, 12:40:00 PM (7 years ago)

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

: 2 edited

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

Legend:

: Unmodified
: Added
: Removed

code/branches/Presentation_HS17
- Property svn:mergeinfo changed
  /code/branches/Waypoints_HS17 reverse-merged: 11496,11523,11539,11559,11582,11603,11633,11655,11657,11659,11661,11687
  /code/branches/ScriptableController_HS17 removed

code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt

r11685	r11690
13	13	ExplosionPart.cc
14	14	Actionpoint.cc
15		~~AutonomousDrone.cc~~
16		~~Arrow.cc~~
17	15	NameableStaticEntity.cc
18	16	)

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

Download in other formats: