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

2015-03-30 23:55:40 +01:00
parent 26991bb2ec 0a31531f44
commit bb385fabd4
6 changed files with 88 additions and 70 deletions
@@ -1,4 +1,4 @@
-// ImGui library v1.37
+// ImGui library v1.38 WIP
 // 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.
@@ -13,7 +13,7 @@
 #include <stdlib.h>         // NULL, malloc, free, qsort, atoi
 #include <string.h>         // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp

-#define IMGUI_VERSION       "1.37"
+#define IMGUI_VERSION       "1.38 WIP"

 // Define assertion handler.
 #ifndef IM_ASSERT