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

Merge branch 'master' into navigation

Browse source 
# Conflicts:
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar 2017-10-27 20:04:51 +02:00
commit edafbcd630
5 changed files with 120 additions and 60 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.52
// dear imgui, v1.53 WIP
// (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base: