Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering

Fork: 0

mark / imgui

Browse code Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 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
commit a76eea85c8535d51a3e767da6b6d4f937a96a9d1 2 parents e3f2ad7 + 8738147 ocornut authored on 31 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

commit a76eea85c8535d51a3e767da6b6d4f937a96a9d1

2 parents e3f2ad7 + 8738147

ocornut authored on 31 May 2015

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View imconfig.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View stb_truetype.h

Ignore Space Show notes View web/examples_03.png 0 → 100644

Ignore Space Show notes View web/test_window_05_menus.png 0 → 100644

Show line notes below