tree b938c64d40bdc6b6b0de5568f3534aa7d809817d
parent 76d8af40369a8f32be1de52c5c1fc1cbf8591354
parent 9bc5c089b6c351b821bbd672f3c002b9b53ead03
author omar <omarcornut@gmail.com> 1517438285 +0100
committer omar <omarcornut@gmail.com> 1517438285 +0100

Merge branch 'master' into navigation

# Conflicts:
#	imgui_demo.cpp