mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-25 12:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,971 Commits 10 Branches 145 Tags
c1ffac2fee77dc39b8385b9825c20b70bd4cae72
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