Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile
pull/12/head
Bert 14 years ago
commit e1cc8058ff

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

Loading…
Cancel
Save