Merge remote-tracking branch 'origin' into 2015-05-menus

Fork: 0

mark / imgui

Browse code Merge remote-tracking branch 'origin' into 2015-05-menus 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 v1.50 v1.49 v1.48 v1.47 v1.46 v1.45 v1.44 v1.43 v1.42 v1.41 v1.40
commit 882b4a5eb420d8a94288bbc0c7d52e5c61086b05 2 parents 92ded00 + 7fbe657 ocornut authored on 21 May 2015

Browse code

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

commit 882b4a5eb420d8a94288bbc0c7d52e5c61086b05

2 parents 92ded00 + 7fbe657

ocornut authored on 21 May 2015

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View examples/opengl3_example/main.cpp

Ignore Space Show notes View imgui.cpp

Show line notes below