Daniel Chappuis 8d2b898168 Fix merge conflicts		2016-08-21 11:47:22 +02:00
..
common	Use override keyword to mark virtual overriden methods	2016-07-11 08:33:24 +02:00
meshes	Remove .mtl file and add doxygen documentation in TriangleVertexArray	2016-04-07 08:48:25 +02:00
nanogui	Fix issue in testbed application on Windows	2016-03-21 18:35:44 +01:00
opengl-framework/src	Fix compilation errors on Visual Studio and warnings	2016-04-12 18:44:55 +02:00
scenes	Fix merge conflicts	2016-08-21 11:47:22 +02:00
shaders	Modifications in testbed application	2015-08-11 22:28:16 +02:00
src	Use override keyword to mark virtual overriden methods	2016-07-11 08:33:24 +02:00
CMakeLists.txt	Fix issues in CMakeLists files for Windows	2016-03-03 17:25:53 +01:00
VisualStudioUserTemplate.user	Set the working directory of the testbed application when building with CMake for Visual Studio	2016-01-09 17:45:55 +01:00