Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-10-29 20:21:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp
This commit is contained in:
omar
2019-04-03 11:17:26 +02:00
parent 9bf6509c6e 8dab7ac021
commit 49fb8e6c45
17 changed files with 138 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imgui.cpp
View File

@@ -944,7 +944,7 @@ CODE
#endif
#include "imgui_internal.h"
#include <ctype.h> // toupper, isprint
#include <ctype.h> // toupper
#include <stdio.h> // vsnprintf, sscanf, printf
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier
#include <stddef.h> // intptr_t