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

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
This commit is contained in:
omar 2018-11-26 14:53:51 +01:00
commit 5261e5a6ba
9 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui.cpp
View file

@ -1,4 +1,4 @@
// dear imgui, v1.66
// dear imgui, v1.67 WIP
// (main code and documentation)
// Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.