Camilla Berglund
|
c06f838d88
|
Merge branch 'master' into multi-monitor
Conflicts:
.gitignore
examples/CMakeLists.txt
include/GL/glfw3.h
src/CMakeLists.txt
src/internal.h
src/win32_platform.h
src/win32_window.c
src/x11_fullscreen.c
src/x11_platform.h
tests/listmodes.c
|
2012-07-05 16:15:01 +02:00 |
|
Marcel Metz
|
df64773a44
|
Moved monitor callback to shared implementation.
|
2012-01-30 14:55:23 +01:00 |
|
Marcel Metz
|
f228d23024
|
Moved platform specific monitor list creation part to separate functions.
|
2012-01-30 12:33:32 +01:00 |
|
Marcel Metz
|
6f970f5753
|
Made monitor list cleanup shared.
|
2012-01-30 12:04:16 +01:00 |
|
Marcel Metz
|
784f60365e
|
Stub implementation of monitor callback.
|
2011-10-09 00:20:34 -04:00 |
|
Camilla Berglund
|
9738728298
|
Reshuffling, formatting and shortening.
|
2011-10-06 23:28:56 +02:00 |
|
Marcel Metz
|
29a4eca87d
|
Renamed monitor related files.
|
2011-10-03 14:22:06 -04:00 |
|
