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 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
5 years ago
..
build_win32.bat Examples: Renamed example folders. (#1870) 6 years ago
example_win32_directx10.vcxproj Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32. 5 years ago
example_win32_directx10.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