Michaël Lemaire 230fd6644e Merge branch 'master' into vegetation ... Conflicts: src/basics/Color.inline.cpp		2015-12-09 00:40:47 +01:00
..
opengl	Merge branch 'master' into vegetation	2015-12-09 00:40:47 +01:00
software	Merge branch 'master' into vegetation	2015-12-09 00:40:47 +01:00