4 Commits

Author	SHA1	Message	Date
ocornut	256594575d	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2021-03-15 20:38:34 +01:00
Rokas Kupstys	1bc6f82091	Misc: added imgui.gdb and imgui.natstepfilter debugger helpers for gdb and msvc.	2021-03-12 17:03:16 +01:00
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