2 Commits (c1ffac2fee77dc39b8385b9825c20b70bd4cae72)

Author SHA1 Message Date
ocornut c1ffac2fee Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
4 years ago
ocornut d20f2bc90a Rename example_emscripten/ to example_emscripten_opengl3/ (#3632) 4 years ago