Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Fork: 0

mark / imgui

Browse code Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 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 88725be3819a47f46ba1eaf6b2b67dcb7a1adb49 2 parents bff9a6b + 7ca21a1 ocornut authored on 11 Apr 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 88725be3819a47f46ba1eaf6b2b67dcb7a1adb49

2 parents bff9a6b + 7ca21a1

ocornut authored on 11 Apr 2015

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View examples/directx11_example/imgui_impl_dx11.cpp

Ignore Space Show notes View imgui.cpp

Show line notes below