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 87ded34f9f Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp
6 years ago
..
build_win32.bat Examples: Renamed example folders. (#1870) 7 years ago
example_win32_directx9.vcxproj Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution. 6 years ago
example_win32_directx9.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