Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
1 parent 6ee317d commit d5b0d51274d59417a5a3dfcb81c58a37c04cffde
@omar omar authored on 22 Aug 2017
Showing 2 changed files
View
imgui.cpp
View
imgui_internal.h