Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile
This commit is contained in:
Bert 2011-02-14 17:56:29 +01:00
commit e1cc8058ff

View File

@ -1,5 +1,5 @@
/* default window dimensions: * /* default window dimensions: *
* (also controllable via -w option) */ * (also controllable via -g option) */
#define WIN_WIDTH 800 #define WIN_WIDTH 800
#define WIN_HEIGHT 600 #define WIN_HEIGHT 600