Merge default into minor

--HG-- branch : minor
2026-08-18 03:34:23 +02:00 · 2017-04-30 00:37:26 -03:00
parent 16f5557131 6b7172bd40
commit b590edf27d
11 changed files with 124 additions and 37 deletions
@@ -213,7 +213,7 @@ public:
 protected:

 	Body *body;
-	fixtureudata *data;
+	fixtureudata *udata;
 	b2Fixture *fixture;
 };