Merge branch 'master' into examples

Fork: 0

mark / imgui

Browse code Merge branch 'master' into examples_refactor docking
commit 91cadc11300b4d7e09daa3ece141f4713a149795 2 parents 47d1360 + 9b9d932 omar authored on 21 Feb 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View examples/sdl_opengl2_example/build_win32.bat

Ignore Space Show notes View examples/sdl_opengl3_example/build_win32.bat

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Show line notes below