tree 64014d647baf7be8fb528c47c64ed5e82b36d6e5
parent c0b366b3165e0d5ba7f1335de1185ebc43533c07
parent c503a50cff830b8aa1790875461c141604f0e62e
author omar <omarcornut@gmail.com> 1509127491 +0200
committer omar <omarcornut@gmail.com> 1509127491 +0200

Merge branch 'master' into navigation

# Conflicts:
#	imgui.cpp
#	imgui.h