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

2013-03-15 16:27:54 -07:00
parent 9a7414f4e9 3c6a802c7c
commit d49e9fd44d
2 changed files with 5 additions and 1 deletions
--- a/btgui/OpenGLWindow/MacOpenGLWindow.h
+++ b/btgui/OpenGLWindow/MacOpenGLWindow.h
@@ -56,6 +56,10 @@ public:
    {
        m_keyboardCallback = keyboardCallback;
    }
+    btKeyboardCallback getKeyboardCallback()
+	{
+	return m_keyboardCallback;
+}
    
 	void setWheelCallback (btWheelCallback wheelCallback)
    {
--- a/build/xcode.command
+++ b/build/xcode.command