mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-16 00:54:19 +00:00
Code Activity

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
omar 2018-08-31 18:39:02 +02:00
commit fd201a90f1
6 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
imgui_widgets.cpp
View file

@ -33,6 +33,11 @@ Index of this file:
#include "imgui_internal.h"
#include <ctype.h> // toupper, isprint
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
#include <stddef.h> // intptr_t
#else
#include <stdint.h> // intptr_t
#endif
// Visual Studio warnings
#ifdef _MSC_VER