Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-11-01 05:31:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,119 Commits 13 Branches 79 Tags
dd4ca70b0d612038edadcf37bf601c0f21206d28
Commit Graph

4 Commits

Author SHA1 Message Date
ocornut
dd4ca70b0d Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
 2020-12-04 19:22:15 +01:00
omar
9c8671e7b0 Tables: Add empty file, skeleton. 2020-12-04 19:15:19 +01:00
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