moonpower/imgui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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
parent c0b366b316 c503a50cff
commit edafbcd630
5 changed files with 120 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imgui_demo.cpp
+1 -1
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: