mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-08-26 00:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viewport

Browse Source 
# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
omar
2018-08-29 17:40:52 +02:00
parent 705ff49400 1c4008aa97
commit 36b2f64051
16 changed files with 522 additions and 393 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.63 WIP
// dear imgui, v1.63
// (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base: