Browse code Merge branch 'master' into context 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
commit cea8017e0bb1eeb95f18d7adaa1af34bcf770d6b 2 parents 27980d9 + 3b7bd45 omar authored on 6 Feb 2018

Showing 15 changed files

• examples/apple_example/imguiex-ios/debug_hud.cpp
• examples/apple_example/imguiex-ios/debug_hud.h
• examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/sdl_opengl3_example/main.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_internal.h
• misc/fonts/README.txt
• misc/freetype/README.md
• misc/freetype/imgui_freetype.cpp
• misc/freetype/imgui_freetype.h
• misc/natvis/imgui.natvis

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.cpp

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.h

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp

Ignore Space Show notes View examples/sdl_opengl2_example/main.cpp

Ignore Space Show notes View examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp

Ignore Space Show notes View examples/sdl_opengl3_example/main.cpp

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

Ignore Space Show notes View misc/fonts/README.txt

Ignore Space Show notes View misc/freetype/README.md 0 → 100644

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp 0 → 100644

Ignore Space Show notes View misc/freetype/imgui_freetype.h 0 → 100644

Ignore Space Show notes View misc/natvis/imgui.natvis

Show line notes below