Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # examples/imgui_impl_vulkan.h # examples/imgui_impl_win32.cpp docking
commit 24aeca3d0c6ffcfe1e7bc558b32a6e816e5f9d8a 2 parents 9660657 + a48815b omar authored on 12 Jun 2018

Browse code

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp

docking

commit 24aeca3d0c6ffcfe1e7bc558b32a6e816e5f9d8a

2 parents 9660657 + a48815b

omar authored on 12 Jun 2018

Patch

Unified Split

Showing 43 changed files

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View examples/README.txt

Ignore Space Show notes View examples/example_apple/README.md

Ignore Space Show notes View examples/example_apple/imguiex-ios/imgui_impl_ios.mm

Ignore Space Show notes View examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj 0 → 100644

Ignore Space Show notes View examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj.filters 0 → 100644

Ignore Space Show notes View examples/example_freeglut_opengl2/main.cpp 0 → 100644

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_sdl_opengl2/main.cpp

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

Ignore Space Show notes View examples/example_win32_directx10/example_win32_directx10.vcxproj

Ignore Space Show notes View examples/example_win32_directx12/example_win32_directx12.vcxproj

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

Ignore Space Show notes View examples/imgui_impl_dx10.h

Ignore Space Show notes View examples/imgui_impl_dx11.cpp

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

Ignore Space Show notes View examples/imgui_impl_dx9.h

Ignore Space Show notes View examples/imgui_impl_freeglut.cpp 0 → 100644

Ignore Space Show notes View examples/imgui_impl_freeglut.h 0 → 100644

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

Ignore Space Show notes View examples/imgui_impl_opengl2.h

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

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

Show line notes below