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

Merge branch 'master' into viewport

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
This commit is contained in:
omar
2019-01-15 21:22:21 +01:00
parent 79d497edae f435aa193b
commit 9391a97fbf
10 changed files with 90 additions and 16 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.67
// dear imgui, v1.68 WIP
// (demo code)
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base: