Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp docking
commit ce500f8727db1343cb8bc0d89a178aee8490fa69 2 parents 9a5f742 + d686333 omar authored on 22 Jun 2018

Showing 31 changed files

• CHANGELOG.txt
• README.md
• examples/README.txt
• examples/example_glfw_vulkan/main.cpp
• examples/example_sdl_opengl2/Makefile
• examples/example_sdl_vulkan/main.cpp
• examples/example_win32_directx12/main.cpp
• examples/imgui_impl_allegro5.h
• examples/imgui_impl_dx10.h
• examples/imgui_impl_dx11.h
• examples/imgui_impl_dx12.cpp
• examples/imgui_impl_dx12.h
• examples/imgui_impl_dx9.h
• examples/imgui_impl_freeglut.h
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_glfw.h
• examples/imgui_impl_marmalade.cpp
• examples/imgui_impl_marmalade.h
• examples/imgui_impl_opengl2.h
• examples/imgui_impl_opengl3.h
• examples/imgui_impl_sdl.cpp
• examples/imgui_impl_sdl.h
• examples/imgui_impl_vulkan.cpp
• examples/imgui_impl_vulkan.h
• examples/imgui_impl_win32.cpp
• examples/imgui_impl_win32.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/README.txt

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

Ignore Space Show notes View examples/example_sdl_opengl2/Makefile

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

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

Ignore Space Show notes View examples/imgui_impl_allegro5.h

Ignore Space Show notes View examples/imgui_impl_dx10.h

Ignore Space Show notes View examples/imgui_impl_dx11.h

Ignore Space Show notes View examples/imgui_impl_dx12.cpp

Ignore Space Show notes View examples/imgui_impl_dx12.h

Ignore Space Show notes View examples/imgui_impl_dx9.h

Ignore Space Show notes View examples/imgui_impl_freeglut.h

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/imgui_impl_glfw.h

Ignore Space Show notes View examples/imgui_impl_marmalade.cpp

Ignore Space Show notes View examples/imgui_impl_marmalade.h

Ignore Space Show notes View examples/imgui_impl_opengl2.h

Ignore Space Show notes View examples/imgui_impl_opengl3.h

Ignore Space Show notes View examples/imgui_impl_sdl.cpp

Ignore Space Show notes View examples/imgui_impl_sdl.h

Ignore Space Show notes View examples/imgui_impl_vulkan.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.h

Ignore Space Show notes View examples/imgui_impl_win32.cpp

Ignore Space Show notes View examples/imgui_impl_win32.h

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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below