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 e32256b4b4 Merge branch 'viewport' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h
6 years ago
..
build_win32.bat Examples: Renamed example folders. (#1870) 6 years ago
example_win32_directx11.vcxproj Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036) 6 years ago
example_win32_directx11.vcxproj.filters Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036) 6 years ago
main.cpp Merge branch 'viewport' into docking 6 years ago