Merge branch 'master' into viewport + comments

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport + comments # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp docking
commit dcbf976a8e8b13b8e56dab181873ac1739dd6e34 2 parents f2d577c + aa668c4 omar authored on 15 Nov 2018

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below