erwin coumans 8cee2e9b23 Merge branch 'master' of https://bitbucket.org/erwincoumans/bullet3_experiments ...

Conflicts:
	btgui/OpenGLWindow/GLInstancingRenderer.cpp

2013-04-03 09:24:21 -07:00

..

donttouch

fix demo/gpudemo build

2013-03-13 13:22:56 -07:00

gpudemo

Merge branch 'master' of https://bitbucket.org/erwincoumans/bullet3_experiments

2013-04-03 09:24:21 -07:00

ObjLoader

minor fixes

2013-04-03 09:19:39 -07:00