tree bca329917c87e08dd2df5d19588eb9e47b9d6296
parent 073dd60b4b3adfd1691406d068f588b61a7490cb
parent 370a48c10bbda08cbf0ba63ade49f64f843b8bd4
author omar <omarcornut@gmail.com> 1508364293 +0200
committer omar <omarcornut@gmail.com> 1508364293 +0200

Merge branch 'master' into navigation

# Conflicts:
#	imgui.cpp