ocornut 6aee4bcdc5 Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_dx9.cpp # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # imgui.cpp		2021-03-02 18:27:07 +01:00
..
example_glut_opengl2.vcxproj	Tables: Add empty file, skeleton.	2020-12-04 19:15:19 +01:00
example_glut_opengl2.vcxproj.filters	Tables: Add empty file, skeleton.	2020-12-04 19:15:19 +01:00
main.cpp	Merge branch 'master' into docking	2021-02-18 11:41:27 +01:00
Makefile	Examples: Fix MinGW detection in makefiles. Fix example_null build due to missing IME input libs. (#2590)	2021-02-24 17:18:53 +01:00