Merge branch 'master' into docking
commit d77d3416d3c5a57e70ee5d27fa7e60e217128409
2 parents 5ce93bc + f717df4
@omar omar authored on 7 Mar 2019
Showing 4 changed files
View
docs/CHANGELOG.txt
View
imgui.cpp
View
imgui.h
View
imgui_widgets.cpp