diff options
| author | artemp <artem@mapnik.org> | 2014-11-21 11:17:18 +0100 |
|---|---|---|
| committer | artemp <artem@mapnik.org> | 2014-11-21 11:17:18 +0100 |
| commit | 1e9b6611cc9a7aff0dc62c02f8ea49b38e8bfd78 (patch) | |
| tree | ad85489bfbad56d7a55ec275c84c1c7aa2dc080f /include | |
| parent | f89c9753ddf9cf31b84e6fd8677291908e146083 (diff) | |
| parent | 545292b6f9d461d439972a204ff747f4902dd4d1 (diff) | |
| download | qtlocation-mapboxgl-1e9b6611cc9a7aff0dc62c02f8ea49b38e8bfd78.tar.gz | |
Merge branch 'master' into image-readers
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/map.hpp | 1 | ||||
| -rw-r--r-- | include/mbgl/map/transform.hpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 43402fe2e5..ad33865cd7 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -115,7 +115,6 @@ public: void resetNorth(); void startRotating(); void stopRotating(); - bool canRotate(); // Debug void setDebug(bool value); diff --git a/include/mbgl/map/transform.hpp b/include/mbgl/map/transform.hpp index e3604edd8b..a42b7aa106 100644 --- a/include/mbgl/map/transform.hpp +++ b/include/mbgl/map/transform.hpp @@ -51,7 +51,6 @@ public: double getAngle() const; void startRotating(); void stopRotating(); - bool canRotate(); // Transitions bool needsTransition() const; |