Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp docking
commit 6cc380fc4168c0cde2bbbe6182525f4bb47899e2 2 parents 1127804 + 61d94ff omar authored on 26 Sep 2018

Showing 22 changed files

• .github/CONTRIBUTING.md
• .github/issue_template.md
• docs/CHANGELOG.txt
• docs/README.md
• examples/example_glfw_vulkan/main.cpp
• examples/example_sdl_vulkan/main.cpp
• examples/imgui_impl_allegro5.cpp
• examples/imgui_impl_allegro5.h
• examples/imgui_impl_freeglut.cpp
• examples/imgui_impl_freeglut.h
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_glfw.h
• examples/imgui_impl_sdl.cpp
• examples/imgui_impl_sdl.h
• examples/imgui_impl_win32.cpp
• examples/imgui_impl_win32.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_widgets.cpp
• misc/fonts/README.txt

Ignore Space Show notes View .github/CONTRIBUTING.md

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

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

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

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

Ignore Space Show notes View examples/imgui_impl_allegro5.h

Ignore Space Show notes View examples/imgui_impl_freeglut.cpp

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

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

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

Show line notes below