1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-17 04:17:17 +01:00
imgui/examples/example_win32_directx12
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_directx12.vcxproj Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary). 2019-01-16 15:10:31 +01: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-02-17 18:33:59 +01:00