Merge branch 'master' into stylesource

2014-07-10 17:21:20 -07:00
parent 7cde26247d 8fc4d61025
commit f89de635ad
7 changed files with 57 additions and 5 deletions
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -405,10 +405,6 @@ const std::vector<std::string> &Map::getAppliedClasses() const {
   return style->getAppliedClasses();
 }

-void Map::setAppliedClasses(std::vector<std::string> &class_names) {
-    style->setAppliedClasses(class_names);
-}
-
 void Map::setDefaultTransitionDuration(uint64_t duration_milliseconds) {
    style->setDefaultTransitionDuration(duration_milliseconds);
 }