ocornut fa004ae79a Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_examples.sln
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx12.h
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
#	imgui_widgets.cpp

2020-09-22 17:00:57 +02:00

..

build_win32.bat

Backends, Examples: DX12: Clarify support for 32-bit building in project files and comments. (#301)

2020-09-08 20:03:34 +02:00

example_win32_directx12.vcxproj

Backends, Examples: DX12: Clarify support for 32-bit building in project files and comments. (#301)

2020-09-08 20:03:34 +02:00

example_win32_directx12.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-09-22 17:00:57 +02:00