Michaël Lemaire c5950f810f Merge branch 'master' into vegetation ... Conflicts: src/definition/Scenery.cpp src/interface/commandline/tests.cpp		2015-12-10 19:48:42 +01:00
..
basics	Merge branch 'master' into vegetation	2015-12-10 19:48:42 +01:00
definition	Merge branch 'master' into vegetation	2015-12-10 19:48:42 +01:00
experiments/bruneton	Format	2015-11-18 17:22:33 +01:00
interface	Merge branch 'master' into vegetation	2015-12-10 19:48:42 +01:00
render	Merge branch 'master' into vegetation	2015-12-09 00:40:47 +01:00
system	Using c++ random generators instead of cstdlib one	2015-12-10 19:40:39 +01:00
tests	Merge branch 'master' into vegetation	2015-12-09 00:40:47 +01:00
.clang-format	Enforced coding style using clang-format	2015-11-09 22:30:46 +01:00
common.pri	Switched to C++-14	2015-11-20 01:04:21 +01:00
paysages.pro	Removed unused preview renderers	2015-08-12 22:53:54 +02:00