Omar bb1e6f8af6 Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/example_win32_directx11/main.cpp # examples/example_win32_directx9/main.cpp # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp		2020-02-17 18:33:59 +01:00
..
build_win32.bat	Examples: Renamed example folders. (#1870)	2018-06-10 15:42:14 +02:00
example_win32_directx11.vcxproj	Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32.	2020-01-29 20:11:42 +01:00
example_win32_directx11.vcxproj.filters	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)	2018-08-30 19:00:33 +02:00
main.cpp	Merge branch 'master' into docking	2020-02-17 18:33:59 +01:00