Browse code Merge branch 'master' into navigation # Conflicts: # imgui.cpp 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 23c11e9764668b2bee126cfb3de903e21eabd566 2 parents bd579e5 + dd41a16 omar authored on 31 Jan 2018

Showing 17 changed files

• examples/allegro5_example/main.cpp
• examples/apple_example/imguiex-ios/GameViewController.m
• examples/apple_example/imguiex-ios/debug_hud.cpp
• examples/apple_example/imguiex-ios/debug_hud.h
• examples/apple_example/imguiex-ios/imgui_impl_ios.mm
• examples/directx10_example/main.cpp
• examples/directx11_example/main.cpp
• examples/directx9_example/main.cpp
• examples/marmalade_example/main.cpp
• examples/opengl2_example/main.cpp
• examples/opengl3_example/main.cpp
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl3_example/main.cpp
• examples/vulkan_example/main.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp

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

Ignore Space Show notes View examples/apple_example/imguiex-ios/GameViewController.m

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/apple_example/imguiex-ios/imgui_impl_ios.mm

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

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

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

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

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

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

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

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

Ignore Space Show notes View examples/vulkan_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

Show line notes below