Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Benjamin Ellenberger
2016-06-04 11:36:43 +02:00
87 changed files with 10795 additions and 873 deletions

View File

@@ -124,6 +124,8 @@ SET(BulletExampleBrowser_SRCS
../TinyRenderer/tgaimage.cpp
../TinyRenderer/our_gl.cpp
../TinyRenderer/TinyRenderer.cpp
../SharedMemory/TinyRendererVisualShapeConverter.cpp
../SharedMemory/TinyRendererVisualShapeConverter.h
../RenderingExamples/TinyRendererSetup.cpp
../SharedMemory/PhysicsServer.cpp
../SharedMemory/PhysicsClientSharedMemory.cpp