Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-06 04:58:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viewport

Browse Source 
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
This commit is contained in:
omar
2018-08-13 17:50:48 -07:00
parent 8ef0ca9765 caaa746424
commit e5f2295398
26 changed files with 237 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/imgui_impl_win32.cpp
View File

@ -9,7 +9,9 @@
#include "imgui.h"
#include "imgui_impl_win32.h"
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <tchar.h>