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

This commit is contained in:
ocornut
2015-07-08 17:08:51 -06:00
3 changed files with 4 additions and 4 deletions

View File

@ -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