Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

README.md

@@ -32,7 +32,7 @@ Demo
 ----
 
 You should be able to build the examples from sources (tested on Windows/Mac/Linux). If you don't, let me know! If you want to have a quick look at the features of ImGui, you can download binaries of the demo app here.
-- [imgui-demo-binaries-20150531.zip](http://www.miracleworld.net/imgui/binaries/imgui-demo-binaries-20150531.zip) (Windows binaries, ImGui 1.40 WIP 2015/05/31, 4 executables, 432 KB)
+- [imgui-demo-binaries-20150708.zip](http://www.miracleworld.net/imgui/binaries/imgui-demo-binaries-20150708.zip) (Windows binaries, ImGui 1.42 2015/07/08, 4 executables, 456 KB)
 
 
 Gallery

imgui.cpp

@@ -1,4 +1,4 @@
-// ImGui library v1.42 wip
+// ImGui library v1.42
 // See ImGui::ShowTestWindow() for sample code.
 // Read 'Programmer guide' below for notes on how to setup ImGui in your codebase.
 // Get latest version at https://github.com/ocornut/imgui

imgui.h

@@ -1,4 +1,4 @@
-// ImGui library v1.42 wip
+// ImGui library v1.42
 // See .cpp file for documentation.
 // See ImGui::ShowTestWindow() for sample code.
 // Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase.
@@ -15,7 +15,7 @@
 #include <stdlib.h>         // NULL, malloc, free, qsort, atoi
 #include <string.h>         // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp
 
-#define IMGUI_VERSION       "1.42 wip"
+#define IMGUI_VERSION       "1.42"
 
 // Define assertion handler.
 #ifndef IM_ASSERT