Merge branch 'master' of https://github.com/JuJuBoSc/imgui into JuJuBoSc-master

Fork: 0

mark / imgui

Browse code Merge branch 'master' of https://github.com/JuJuBoSc/imgui into JuJuBoSc-master 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
commit 59f0db6f15877c4e6bf86b4d2f8b344db1bde24c 2 parents 730e811 + 32c1a3e ocornut authored on 3 Dec 2015

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View examples/directx10_example/build_win32.bat 0 → 100644

Ignore Space Show notes View examples/directx10_example/directx10_example.vcxproj 0 → 100644

Ignore Space Show notes View examples/directx10_example/directx10_example.vcxproj.filters 0 → 100644

Ignore Space Show notes View examples/directx10_example/imgui_impl_dx10.cpp 0 → 100644

Ignore Space Show notes View examples/directx10_example/imgui_impl_dx10.h 0 → 100644

Ignore Space Show notes View examples/directx10_example/main.cpp 0 → 100644

Ignore Space Show notes View examples/imgui_examples_msvc2010.sln

Show line notes below