Fork: 0
mark / imgui
Browse code
Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.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 3ea5e67ba24d4986d481ee0bea0a654a0556770e
2 parents 0a3db26 + 02e0a07
@omar omar authored on 12 Dec 2017
Patch
Unified Split
Showing 2 changed files
View
imgui.cpp
View
imgui_internal.h