Michaël Lemaire 9a096ec329 Merge branch 'master' into vegetation ... Conflicts: src/basics/Disk.cpp src/basics/Disk.h src/basics/SpaceSegment.cpp src/definition/DefinitionNode.cpp src/definition/DefinitionNode.h src/definition/Scenery.cpp src/definition/Scenery.h src/definition/SurfaceMaterial.cpp src/definition/SurfaceMaterial.h src/definition/TextureLayerDefinition.cpp src/definition/definition_global.h src/interface/commandline/tests.cpp src/render/opengl/OpenGLRenderer.cpp src/render/software/SoftwareCanvasRenderer.cpp src/render/software/SoftwareCanvasRenderer.h src/render/software/SoftwareRenderer.h src/render/software/TerrainRasterizer.cpp src/render/software/TerrainRasterizer.h src/render/software/TerrainRenderer.h src/render/software/software_global.h		2015-11-09 22:38:00 +01:00
..
commandline.pro	Simplified project files + lazy init of data files	2015-10-19 01:39:22 +02:00
main.cpp	Enforced coding style using clang-format	2015-11-09 22:30:46 +01:00
render.cpp	Enforced coding style using clang-format	2015-11-09 22:30:46 +01:00
tests.cpp	Merge branch 'master' into vegetation	2015-11-09 22:38:00 +01:00