Merge branch 'master' of https://code.google.com/p/supertux

Conflicts:
	CMakeLists.txt

diff --git a/tools/miniswig/parser.yy b/tools/miniswig/parser.yy
index e609476..ec45f43 100644 (file)
--- a/tools/miniswig/parser.yy
+++ b/tools/miniswig/parser.yy
@@ -9,7 +9,7 @@
 
 %}
 
-%pure_parser
+%pure-parser
 %union {
     char*       str;
     int         ival;