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.
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
4 years ago
..
build_win32.bat Backends, Examples: DX12: Clarify support for 32-bit building in project files and comments. (#301) 4 years ago
example_win32_directx12.vcxproj Backends, Examples: DX12: Clarify support for 32-bit building in project files and comments. (#301) 4 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 4 years ago