7 Commits

Author	SHA1	Message	Date
ocornut	388ca563db	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_dx12.cpp	2021-01-15 19:20:42 +01:00
ocornut	feaa7ea003	Examples: Emscripten: Amend ba636c5. (#3705)	2021-01-11 18:46:23 +01:00
Horki	0f14dd9781	Examples: Emscripten: Add 'make serve' helper, move output to web/ folder. (#3705)	2021-01-11 18:46:23 +01:00
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