Merged changes from original master

Fork: 0

mark / imgui

Browse code Merged changes from original 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 v1.46 v1.45 v1.44 v1.43 v1.42 v1.41 v1.40 v1.38 v1.37 v1.36 v1.35 v1.34 v1.33b v1.33 v1.32 v1.31
commit e6318abcee12ff8e1a426bd4c07548f0f2ea8ff8 2 parents 3478e3a + cc3d41d Jim Tilander authored on 1 Feb 2015

Browse code

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 v1.38 v1.37 v1.36 v1.35 v1.34 v1.33b v1.33 v1.32 v1.31

commit e6318abcee12ff8e1a426bd4c07548f0f2ea8ff8

2 parents 3478e3a + cc3d41d

Jim Tilander authored on 1 Feb 2015

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/directx11_example/directx11_example.vcxproj

Ignore Space Show notes View extra_fonts/DroidSans.ttf 0 → 100644
Not supported

Ignore Space Show notes View extra_fonts/README.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Show line notes below