Merge branch 'master' into docking
commit 6b43a314bf2e748c4fd2c12fdc3bddce4b3448f9
2 parents 8915f79 + cf3cb7c
@omar omar authored on 26 Feb 2019
Showing 3 changed files
View
docs/CHANGELOG.txt
View
imgui_internal.h
View
imgui_widgets.cpp