mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 01:54:21 +00:00
Code Activity

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp
This commit is contained in:
omar 2018-06-22 12:01:42 +02:00
commit ce500f8727
31 changed files with 199 additions and 185 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.62 WIP
// dear imgui, v1.62
// (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base: