omar e7bfcb970e Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h

2020-01-30 15:21:16 +01:00

..

build_win32.bat

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

example_win32_directx10.vcxproj

Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32.

2020-01-29 20:11:42 +01:00

example_win32_directx10.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

2019-11-26 12:23:43 +01:00