Browse code Merge branch 'viewport' into docking # Conflicts: # examples/example_allegro5/main.cpp # examples/example_marmalade/main.cpp docking
commit 4a43f347bb6d0c4adf4e948f3f8c754df150bdee 2 parents ae34241 + dcbf976 omar authored on 15 Nov 2018

Showing 23 changed files

• docs/CHANGELOG.txt
• docs/README.md
• examples/example_allegro5/main.cpp
• examples/example_apple_opengl2/main.mm
• examples/example_freeglut_opengl2/main.cpp
• examples/example_glfw_opengl2/main.cpp
• examples/example_glfw_opengl3/main.cpp
• examples/example_glfw_vulkan/main.cpp
• examples/example_marmalade/main.cpp
• examples/example_sdl_opengl2/main.cpp
• examples/example_sdl_opengl3/main.cpp
• examples/example_sdl_vulkan/main.cpp
• examples/example_win32_directx10/main.cpp
• examples/example_win32_directx11/main.cpp
• examples/example_win32_directx12/main.cpp
• examples/example_win32_directx9/main.cpp
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_glfw.h
• examples/imgui_impl_opengl3.cpp
• imgui.cpp
• imgui.h
• imgui_internal.h
• imgui_widgets.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

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

Ignore Space Show notes View examples/example_apple_opengl2/main.mm

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below