Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking docking
commit 5bf9029bf9bf17e1778ce0ada07cdf747eafb154 2 parents 09c9bf2 + f5bf6e3 omar authored on 18 Feb 2019

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/example_apple_opengl2/main.mm

Ignore Space Show notes View examples/imgui_impl_vulkan.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View misc/freetype/README.md

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Show line notes below