Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 09:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,315 Commits 13 Branches 79 Tags 86 MiB
f1bf642e8f
Commit Graph

2 Commits

Author SHA1 Message Date
ocornut
f1bf642e8f Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	misc/debuggers/imgui.natvis
 2021-03-11 16:32:14 +01:00
ocornut
fdc2324d9a Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis' 2021-03-11 16:21:46 +01:00