Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp docking
commit 9d0bc3f9abb4cd8ef0d99c682c0f04b15b032313 2 parents afe9c5c + b1cd52b omar authored on 21 Dec 2018

Patch

Unified Split

Showing 1 changed file

Ignore Space Show notes View examples/imgui_impl_sdl.cpp

Show line notes below