tree fb4b49c8724737b4b88a3adb10319815102d9102
parent a7e5945206751eefd73ae9580d1ff4d50456b9e1
parent e6b29b70b4a49ff1731de8be73a49af4fd181e3c
author ocornut <omarcornut@gmail.com> 1438314847 -0600
committer ocornut <omarcornut@gmail.com> 1438314847 -0600

Merge remote-tracking branch 'origin' into 2015-07-cleanup

Conflicts:
	imgui.cpp