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, 7 insertions, 7 deletions

diff --git a/src/sound.cpp b/src/sound.cpp
index 40c929824..a573458ef 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -51,7 +51,7 @@ Sound::Sound():
     mInstalled(false),
     mSfxVolume(100),
     mMusicVolume(60),
-    mMusic(0),
+    mMusic(nullptr),
     mPlayBattle(false),
     mPlayGui(false),
     mPlayMusic(false),
@@ -70,7 +70,7 @@ Sound::~Sound()
     config.removeListener("playMusic", this);
 
     // Unlink the callback function.
-    Mix_HookMusicFinished(NULL);
+    Mix_HookMusicFinished(nullptr);
 }
 
 void Sound::optionChanged(const std::string &value)
@@ -202,7 +202,7 @@ static Mix_Music *loadMusic(const std::string &filename)
         if (success)
             path = resman->getPath("tempMusic.ogg");
         else
-            return NULL;
+            return nullptr;
     }
     else
     {
@@ -210,7 +210,7 @@ static Mix_Music *loadMusic(const std::string &filename)
     }
 
     if (path.empty())
-        return 0;
+        return nullptr;
 
     Mix_Music *music = Mix_LoadMUS(path.c_str());
 
@@ -247,7 +247,7 @@ void Sound::stopMusic()
     {
         Mix_HaltMusic();
         Mix_FreeMusic(mMusic);
-        mMusic = NULL;
+        mMusic = nullptr;
     }
 }
 
@@ -298,7 +298,7 @@ void Sound::logic()
         if (mMusic)
         {
             Mix_FreeMusic(mMusic);
-            mMusic = NULL;
+            mMusic = nullptr;
         }
         sFadingOutEnded = false;
 
@@ -380,7 +380,7 @@ void Sound::haltMusic()
 
     Mix_HaltMusic();
     Mix_FreeMusic(mMusic);
-    mMusic = NULL;
+    mMusic = nullptr;
 }
 
 void Sound::changeAudio()