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

diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index 5f5b1b257..40ab68865 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -37,7 +37,7 @@ ParticleContainer::~ParticleContainer()
     if (mDelParent)
     {
         delete mNext;
-        mNext = 0;
+        mNext = nullptr;
     }
 }
 
@@ -139,7 +139,7 @@ void ParticleVector::setLocally(int index, Particle *particle)
     delLocally(index);
 
     if (mIndexedElements.size() <= static_cast<unsigned>(index))
-        mIndexedElements.resize(index + 1, NULL);
+        mIndexedElements.resize(index + 1, nullptr);
 
     if (particle)
         particle->disableAutoDelete();
@@ -157,7 +157,7 @@ void ParticleVector::delLocally(int index)
     Particle *p = mIndexedElements[index];
     if (p)
     {
-        mIndexedElements[index] = NULL;
+        mIndexedElements[index] = nullptr;
         p->kill();
     }
 }
@@ -182,7 +182,7 @@ void ParticleVector::moveTo(float x, float y)
             if ((*it)->isExtinct())
             {
                 (*it)->kill();
-                *it = NULL;
+                *it = nullptr;
             }
         }
     }