Camilla Berglund 7c426d1c92 Merge branch 'master' into multi-monitor ...

Conflicts:
	examples/wave.c
	src/init.c
	src/internal.h
	src/window.c
	tests/accuracy.c
	tests/events.c
	tests/reopen.c

2012-11-01 00:07:01 +01:00

14 KiB

Raw Blame History

View Raw