Merge branch 'master' into clipboard

This commit is contained in:
Camilla Berglund
2012-03-29 14:30:21 +02:00
5 changed files with 26 additions and 2 deletions
+3
View File
@@ -679,6 +679,9 @@ const char* _glfwPlatformGetVersionString(void)
" Linux-joystick-API"
#else
" no-joystick-support"
#endif
#if defined(_GLFW_BUILD_DLL)
" shared"
#endif
;