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 ffa863a3ba Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp
4 years ago
..
Makefile Tables: Add empty file, skeleton. 4 years ago
example_glut_opengl2.vcxproj Tables: Add empty file, skeleton. 4 years ago
example_glut_opengl2.vcxproj.filters Tables: Add empty file, skeleton. 4 years ago
main.cpp Merge branch 'master' into docking 4 years ago