Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp docking
commit a33d45d7cd04e38848d3e3650927ca15653542fb 2 parents 5a665e4 + 9a0e71a omar authored on 28 Mar 2019

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/example_freeglut_opengl2/main.cpp

Ignore Space Show notes View examples/imgui_impl_freeglut.cpp

Ignore Space Show notes View examples/imgui_impl_freeglut.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Show line notes below