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

Conflicts: CMakeLists.txt
SuperTux · Aug 3, 2014 · 3bdde1d · 3bdde1d
2 parents 8b1d961 + 3f77e6f
commit 3bdde1d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tools/miniswig/parser.yy b/tools/miniswig/parser.yy
@@ -9,7 +9,7 @@
 
 %}
 
-%pure_parser
+%pure-parser
 %union {
     char*       str;
     int         ival;