Merge branch 'features/ellipsis_rendering'
# Conflicts:
#	imgui.cpp
commit 3b014d0c31f7149957ea2ae65b057cbe6003ebd0
2 parents 3f986e7 + 1c951dc
@omar omar authored on 17 Sep 2019
Showing 7 changed files
View
docs/CHANGELOG.txt
View
docs/TODO.txt
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp
View
imgui_internal.h