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

Fork: 0

mark / imgui

Browse code Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-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
commit b63785026072f986fc0259c46d0215b88490c0dc 2 parents 1482260 + 947cf34 ocornut authored on 8 Aug 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

commit b63785026072f986fc0259c46d0215b88490c0dc

2 parents 1482260 + 947cf34

ocornut authored on 8 Aug 2015

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View examples/opengl3_example/Makefile

Ignore Space Show notes View examples/opengl_example/Makefile

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below