Merge branch 'master' into debian
852a13e04e2f
Actions

Authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> on Feb 25 2013, 17:36.

Description

Merge branch 'master' into debian

Committed

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

Feb 25 2013, 17:36

Pushed

tuleu

May 7 2018, 15:32

Parents

Branches

Unknown

Tags

Unknown

Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> committed R6624:852a13e04e2f: Merge branch 'master' into debian (authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>).Feb 25 2013, 17:36

Commit	Author	Details	Committed
4d74834b2642	Alexandre Tuleu	Releases 0.2.0~rc2	Feb 22 2013
20421fd6f133	Alexandre Tuleu	Updates pkg-confi dependencies	Feb 22 2013
a9e1149417e8	Alexandre Tuleu	Adds ASLP leg design	Feb 22 2013

				Path
	M			CMakeLists.txt
	M			src/liboncilla-webots/LegParameters.h
	M			src/liboncilla-webots/WebotsOncillaBackend.cpp
	M			src/liboncilla-webots/nodes/Trunk.cpp
	M			webots-data/config/liboncilla-webots.config
	M			webots-data/controllers/with-cca/Makefile
	M			webots-data/controllers/with-rci/Makefile
	P			webots-data/worlds/Oncilla-ASLP.wbt Copied from webots-data/worlds/Oncilla.wbt