Merge branch 'master' into docking
# Conflicts:
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	imgui.cpp
commit dfb82d5c22d6403c1e9e8a534d5f732263194e27
2 parents d0fb547 + 56c3aaf
@omar omar authored on 25 Apr 2019
Showing 17 changed files
View
docs/CHANGELOG.txt
View
docs/TODO.txt
View
examples/example_emscripten/main.cpp
View
examples/example_sdl_opengl2/main.cpp
View
examples/example_sdl_opengl3/main.cpp
View
examples/example_sdl_vulkan/main.cpp
View
examples/imgui_impl_glfw.cpp
View
examples/imgui_impl_glut.cpp
View
examples/imgui_impl_glut.h
View
examples/imgui_impl_sdl.cpp
View
examples/imgui_impl_sdl.h
View
examples/imgui_impl_win32.cpp
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_internal.h
View
imgui_widgets.cpp