Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering

Conflicts:
	imgui.cpp
	imgui.h

examples/directx9_example/imgui_impl_dx9.cpp

@@ -239,6 +239,10 @@ static void ImGui_ImplDX9_CreateFontsTexture()
 
     // Store our identifier
     io.Fonts->TexID = (void *)pTexture;
+
+    // Cleanup (don't clear the input data if you want to append new fonts later)
+    io.Fonts->ClearInputData();
+    io.Fonts->ClearTexData();
 }
 
 bool ImGui_ImplDX9_CreateDeviceObjects()