Merge branch 'master' into wp8

2013-12-10 23:36:46 +01:00
parent b15b4c6c90 f0e6d820c7
commit 7f94e4db31
2 changed files with 7 additions and 5 deletions
@@ -16,6 +16,7 @@ private:
    static const float step;

    int displayedPhaseId;
+    int newPhaseId;
    float angle;
    float zoomFactor;
    OutQuadEasing angleEasing;