Merge remote-tracking branch 'origin' into 2015-06-multiline

Fork: 0

mark / imgui

Browse code Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit Conflicts: imgui.h 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 v1.50 v1.49 v1.48 v1.47 v1.46 v1.45 v1.44 v1.43 v1.42 v1.41
commit 748837acfd15eca794500c1764079229f7bae3f3 2 parents 9765559 + a248575 ocornut authored on 16 Jun 2015

Browse code

Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit

Conflicts:
	imgui.h

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 v1.50 v1.49 v1.48 v1.47 v1.46 v1.45 v1.44 v1.43 v1.42 v1.41

commit 748837acfd15eca794500c1764079229f7bae3f3

2 parents 9765559 + a248575

ocornut authored on 16 Jun 2015

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Show line notes below