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

Merge branch 'master_164' into viewport_164

Browse Source 
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp
This commit is contained in:
omar
2018-08-31 10:28:21 +02:00
parent c83391262e 48db5713d6
commit 0c24fe276c
7 changed files with 109 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imgui_demo.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.64 WIP
// dear imgui, v1.64
// (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base: