From 6be8c840bbe1bb14f2ab32fefdd2a600f1363a08 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Wed, 3 Dec 2014 23:03:14 +1100
Subject: [PATCH] Merge branch 'master' of github.com:mapbox/mapbox-gl-native
 into android-mason

---
 configure                      | 2 +-
 platform/default/glfw_view.cpp | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/configure b/configure
index fe39e7767..bacec88c0 100755
--- a/configure
+++ b/configure
@@ -37,7 +37,7 @@ case ${MASON_PLATFORM} in
         LIBZIP_VERSION=0.11.2
         ;;
     *)
-        GLFW_VERSION=a21f2377
+        GLFW_VERSION=e1ae9af5
         SQLITE_VERSION=system
         LIBPNG_VERSION=1.6.13
         LIBJPEG_VERSION=v8d
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index d835d03ec..e600340dd 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -263,12 +263,6 @@ void GLFWView::notify() {
 
 void GLFWView::swap() {
     glfwPostEmptyEvent();
-
-    double lon, lat, zoom;
-    map->getLonLatZoom(lon, lat, zoom);
-    const double bearing = map->getBearing();
-    const std::string title = mbgl::util::sprintf<128>("Mapbox GL – %.2f/%.6f/%.6f/%.1f", zoom, lat, lon, bearing);
-    glfwSetWindowTitle(window, title.c_str());
 }
 
 void GLFWView::notify_map_change(mbgl::MapChange /*change*/, mbgl::timestamp /*delay*/) {