mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-26 02:34:23 +00:00
Code Activity

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
omar 2018-09-06 15:59:35 +02:00
commit b974fffea0
11 changed files with 24 additions and 15 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.65 WIP
// dear imgui, v1.65
// (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base: