You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

omar 0cbb96895a Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx12.cpp # imgui.cpp # imgui.h # imgui_widgets.cpp		5 years ago
..
build_win32.bat	Examples: Renamed example folders. (#1870)	6 years ago
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).	6 years ago
example_win32_directx12.vcxproj.filters	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)	6 years ago
main.cpp	Merge branch 'master' into docking	5 years ago