mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-10 05:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,673 Commits 9 Branches 143 Tags
835a5344b01e79aca479e95fa9d36fb5fdef3d14
Commit Graph

3 Commits

Author SHA1 Message Date
ocornut
835a5344b0 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
 2021-09-24 15:49:28 +02:00
ocornut
fba756176d Backends: SDL_Renderer: Amend 1d2d246, various tweaks, fixes, sync to latest. (#3926) 2021-09-21 19:29:48 +02:00
Sylvain
62b17f928e Backends: SDL_Renderer: Added renderer backend for SDL 2.0.17+ (#3926) 
(Squashed 20 commits)
 2021-09-21 19:29:48 +02:00