Browse code Merge branch 'master' into viewport # Conflicts: # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp docking
commit c29971cf72ec4e4e795a61d953810999c32dd1f1 2 parents ccc9a22 + 74b7dce omar authored on 20 Mar 2018

Showing 11 changed files

• TODO.txt
• examples/imgui_impl_vulkan.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
• imgui_internal.h

Ignore Space Show notes View TODO.txt

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

Ignore Space Show notes View imgui_internal.h

Show line notes below