Merge branch 'master' into strippedstripped1.1.11.12

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/focushandler.cpp
	src/guichan/graphics.cpp
	src/guichan/gui.cpp
	src/guichan/image.cpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/icon.cpp
	src/guichan/widgets/imagebutton.cpp
	src/guichan/widgets/listbox.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp

1 files changed, 5 insertions, 4 deletions

diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index 72a839573..a8563c679 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -36,7 +36,8 @@
 #endif
 
 ProxyImage::ProxyImage(SDL_Surface *s):
-    mImage(NULL), mSDLImage(s)
+    mImage(nullptr),
+    mSDLImage(s)
 {
 }
 
@@ -50,12 +51,12 @@ void ProxyImage::free()
     if (mSDLImage)
     {
         SDL_FreeSurface(mSDLImage);
-        mSDLImage = 0;
+        mSDLImage = nullptr;
     }
     else
     {
         delete mImage;
-        mImage = 0;
+        mImage = nullptr;
     }
 }
 
@@ -103,7 +104,7 @@ void ProxyImage::convertToDisplayFormat()
                     SDL_MapRGB(mSDLImage->format, 255, 0, 255));
     mImage = ::Image::load(mSDLImage);
     SDL_FreeSurface(mSDLImage);
-    mSDLImage = NULL;
+    mSDLImage = nullptr;
 }
 
 gcn::Image *ImageLoader::load(const std::string &filename, bool convert)