Merge branch 'master' into wp8

2013-12-11 20:44:01 +01:00
parent 7f94e4db31 5d92553017
commit 650fdeb676
2 changed files with 21 additions and 9 deletions
@@ -16,7 +16,6 @@ private:
    static const float step;

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