merge from master

This commit is contained in:
seanpringle
2012-09-22 17:54:01 +10:00
parent 4a2cb9f9e7
commit d38864aab8
2 changed files with 77 additions and 134 deletions

View File

@@ -1,4 +1,4 @@
CFLAGS?=-Wall -Os
CFLAGS?=-Wall -Os -std=c99
LDADD?=`pkg-config --cflags --libs x11 xinerama`
normal:
@@ -12,4 +12,4 @@ docs:
clean:
rm -f xoat xoat-debug
all: docs normal
all: docs normal