Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor

This commit is contained in:
Camilla Berglund
2012-02-05 02:50:22 +01:00
9 changed files with 150 additions and 153 deletions
+2 -2
View File
@@ -275,8 +275,8 @@ void _glfwInitJoysticks(void);
void _glfwTerminateJoysticks(void);
// Monitors
void _glfwInitMonitors(void);
void _glfwTerminateMonitors(void);
_GLFWmonitor* _glfwCreateMonitors(void);
_GLFWmonitor* _glfwDestroyMonitor(_GLFWmonitor* monitor);
// Unicode support
long _glfwKeySym2Unicode(KeySym keysym);