Fork: 0
mark / imgui
Browse code
Merge branch 'master' into navigation + fix previous merge
# 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
commit 7ad169fa0946d0df321a5fff4c8698ea30a20154
2 parents 66b2ee6 + d730a76
@omar omar authored on 7 Jan 2018
Patch
Unified Split
Showing 1 changed file
View
imgui.cpp