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