Fork: 0
mark / imgui
Browse code
Merge pull request #389 from dougbinks/master
Font merge demo and documentation minor additions.
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 d0afb23a3fb9a90bb4a430b418c7dad65f2af138
2 parents 0b0c460 + e1bc0dd
@omar omar authored on 30 Oct 2015
Patch
Unified Split
Showing 2 changed files
View
examples/opengl_example/main.cpp
View
extra_fonts/README.txt