Michaël Lemaire 030be52f6f Merge branch 'master' into vegetation ... Conflicts: src/definition/definition.pro src/render/software/software.pro		2015-10-19 17:40:17 +02:00
..
basics	Simplified project files + lazy init of data files	2015-10-19 01:39:22 +02:00
definition	Merge branch 'master' into vegetation	2015-10-19 17:40:17 +02:00
experiments/bruneton	Made bruneton source code dump intermediary textures	2013-12-25 18:01:44 +01:00
interface	Simplified project files + lazy init of data files	2015-10-19 01:39:22 +02:00
render	Merge branch 'master' into vegetation	2015-10-19 17:40:17 +02:00
system	Simplified project files + lazy init of data files	2015-10-19 01:39:22 +02:00
tests	Simplified project files + lazy init of data files	2015-10-19 01:39:22 +02:00
common.pri	Renaming editing -> interface/desktop	2013-11-14 21:46:47 +01:00
paysages.pro	Removed unused preview renderers	2015-08-12 22:53:54 +02:00