Merge remote-tracking branch 'origin/master'

Conflicts: Makefile
2011-02-14 17:56:29 +01:00 · 2011-02-14 17:56:29 +01:00 · e1cc8058ff
parent f71ea095bc c9a887d0fd
commit e1cc8058ff
1 changed files with 1 additions and 1 deletions
--- a/config.h
+++ b/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