mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-04 04:00:07 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_dx11.cpp
#	imgui.cpp
This commit is contained in:
omar 2019-08-19 21:49:53 +02:00
commit aedcd2fb1a
13 changed files with 118 additions and 81 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.72b
// dear imgui, v1.73 WIP
// (demo code)
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base: