Fork: 0
mark / imgui
Browse code
Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
# Conflicts:
#	imgui.cpp
docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64 v1.63 v1.62 v1.61 v1.60 v1.53 v1.52 v1.51
commit f98376d02b0c650e4f7f8b2f3b70c7aec7acb764
2 parents a83f708 + 32dbe83
@omar omar authored on 15 Aug 2017
Patch
Unified Split
Showing 2 changed files
View
imgui.cpp
View
imgui.h