Browse code Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_internal.h docking
commit ddc3f8f069f573ac765ee3bf3b6679fd339f2f43 2 parents 131de7a + 5261e5a omar authored on 26 Nov 2018

Showing 12 changed files

• docs/CHANGELOG.txt
• docs/TODO.txt
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_sdl.cpp
• examples/imgui_impl_sdl.h
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

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 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

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below