Merge remote-tracking branch 'origin/master'
Conflicts: Makefile
This commit is contained in:
commit
e1cc8058ff
2
config.h
2
config.h
@ -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…
x
Reference in New Issue
Block a user