mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-20 03:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,972 Commits 9 Branches 149 Tags
657589ab47b31e66804c71fbcdaf0f72e8e4f146
Commit Graph

2 Commits

Author SHA1 Message Date
ocornut
c1ffac2fee Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2020-12-03 20:05:49 +01:00
ocornut
d20f2bc90a Rename example_emscripten/ to example_emscripten_opengl3/ (#3632) 2020-12-02 11:23:56 +01:00