mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-24 05:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
omar
2020-06-29 17:15:40 +02:00
parent f4f04cb5ec 9418dcb693
commit ddabfc3477
10 changed files with 53 additions and 157 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.77 WIP
// dear imgui, v1.77
// (demo code)
// Help: