Merge branch 'master' into debian
15180ed58f83
Actions

Authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> on Mar 1 2013, 15:56.

Description

Merge branch 'master' into debian

Committed

Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>

Mar 1 2013, 15:56

Pushed

tuleu

May 7 2018, 15:32

Parents

Branches

Unknown

Tags

Unknown

Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> committed R6624:15180ed58f83: Merge branch 'master' into debian (authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>).Mar 1 2013, 15:56

Commit	Author	Details	Committed
03d43b7cf406	Alexandre Tuleu	Releases 0.2.0~rc3	Mar 1 2013
88528b8cddaa	Alexandre Tuleu	Adds SupervisorWorld implementation	Mar 1 2013
c3aa0fc93549	Arne Nordmann/Alexandre Tuleu	Added include necessary for g++-4.4	Mar 1 2013
f3bccc9b1cc2	Arne Nordmann/Alexandre Tuleu	Adapted webots example makefile to cca-oncilla trunk	Mar 1 2013

				Path
	M			CMakeLists.txt
	M			src/liboncilla-webots/CMakeLists.txt
	M			src/liboncilla-webots/Config.h
	M			src/liboncilla-webots/LegParameters.h
	M			src/liboncilla-webots/WebotsOncillaBackend.cpp
	M			src/liboncilla-webots/WebotsOncillaBackend.h
	M			src/liboncilla-webots/nodes/Nodes.h
	A			src/liboncilla-webots/nodes/SupervisorWorld.cpp
	A			src/liboncilla-webots/nodes/SupervisorWorld.h
	M			webots-data/controllers/with-cca/Makefile