merge with 2.5 (not trunk, last merge message said that on accident) at r22252
[blender.git] / source / blender / editors / mesh / meshtools.c
index 5f406cb4db8e29d0beada4a26fb023b99f760934..49e721f34e8be897ca00293f958c036d7274b3bf 100644 (file)
@@ -97,7 +97,7 @@
 #include "mesh_intern.h"
 
 /* XXX */
-static void waitcursor() {}
+static void waitcursor(int val) {}
 static void error() {}
 static int pupmenu() {return 0;}
 /* XXX */