Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'bp/master'

Browse Source 
Conflicts:
	examples/ExampleBrowser/CMakeLists.txt
	examples/OpenGLWindow/CMakeLists.txt
This commit is contained in:
Erwin Coumans
2015-12-07 16:42:45 -08:00
parent 13f314f401 ab283251d3
commit 52f074bcb2
33 changed files with 382 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ThirdPartyLibs/lua-5.2.3/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES(
.
.
src
)