Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 11071 for code/trunk/src/orxonox/controllers/WaypointController.h

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

Files:

: 2 edited

. (modified) (1 prop)
src/orxonox/controllers/WaypointController.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/trunk

Property svn:mergeinfo changed

/code/branches/cpp11 (added)	merged: 10439-10441,10443,10545
/code/branches/cpp11_v2	merged: 10732-10734,10736,10742,10744-10745,10765,10768-10778,10781,10813,10817-10818,10821-10822,10825,10828-10830,10845-10846,10852-10853,10857,10865,10876,10916-10920,10922,10975-10994,10996-11008,11010
/code/branches/cpp11_v3 (added)	merged: 11053-11054,11057-11070

code/trunk/src/orxonox/controllers/WaypointController.h

r9667	r11071
44	44	virtual ~WaypointController();
45	45
46		virtual void tick(float dt);
	46	virtual void tick(float dt) override;
47	47
48	48	protected:

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

Download in other formats: