Merge branch 'master' into debian
5f5540a0cf84
Actions

Authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> on Jul 4 2012, 11:52.

Description

Merge branch 'master' into debian

Committed

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

Jul 4 2012, 11:52

Pushed

tuleu

May 7 2018, 15:32

Parents

Branches

Unknown

Tags

Unknown

Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> committed R6624:5f5540a0cf84: Merge branch 'master' into debian (authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>).Jul 4 2012, 11:52

	Commit			Author	Details	Committed
	151b7e1be0f6			Alexandre Tuleu	Released version 0.1.0rc5	Jul 4 2012
	2b364add0168			Alexandre Tuleu	Resized texture to avoid crash on Webots >= 6.4.2	Jul 4 2012

				Path
	M			CMakeLists.txt
	P			webots-data/worlds/Oncilla.wbt Copied from webots-data/worlds/Oncilla.wbt.in
	D			webots-data/worlds/texture_grid.png
	M			webots-data/worlds/textures/floor.jpg
	D			webots-data/worlds/textures/spring.jpg