Merge branch 'master' into 2016-02-colorpicker

This commit is contained in:
omar
2017-07-19 14:53:25 +08:00
13 changed files with 189 additions and 105 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.50 WIP
// dear imgui, v1.51 WIP
// (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base:
@ -15,7 +15,7 @@
#include <ctype.h> // toupper, isprint
#include <math.h> // sqrtf, powf, cosf, sinf, floorf, ceilf
#include <stdio.h> // vsnprintf, sscanf, printf
#include <stdlib.h> // NULL, malloc, free, qsort, atoi
#include <stdlib.h> // NULL, malloc, free, atoi
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
#include <stddef.h> // intptr_t
#else