Bug 1297276 - Fix merge bustage. a=bustage
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 25 Aug 2016 08:40:42 -0400
changeset 311091 c40fc4c00620b1662d3225b71c99ad4ff12edf0f
parent 311089 9467a563a01b466fdca07c0495de7bcfd0a66215
child 311092 7963ebdd52b93f96b812eff2eab8d94097147b9c
push id81035
push userryanvm@gmail.com
push dateThu, 25 Aug 2016 13:00:54 +0000
treeherdermozilla-inbound@5c004110c2b3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1297276
milestone51.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1297276 - Fix merge bustage. a=bustage
gfx/gl/GLContextProviderGLX.cpp
--- a/gfx/gl/GLContextProviderGLX.cpp
+++ b/gfx/gl/GLContextProviderGLX.cpp
@@ -10,17 +10,17 @@
 #endif
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/widget/CompositorWidget.h"
-#include "mozilla/unused.h"
+#include "mozilla/Unused.h"
 
 #include "prenv.h"
 #include "GLContextProvider.h"
 #include "GLLibraryLoader.h"
 #include "nsDebug.h"
 #include "nsIWidget.h"
 #include "GLXLibrary.h"
 #include "gfxXlibSurface.h"