Browse code Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt docking
commit e2c1f0a7cd4fa3bf7477eaebf89c7ac11aec4f78 2 parents ca43436 + dd41df3 omar authored on 18 Jun 2019

Showing 27 changed files

• docs/CHANGELOG.txt
• docs/README.md
• examples/README.txt
• examples/example_glfw_metal/main.mm
• examples/example_glfw_opengl2/main.cpp
• examples/example_glfw_opengl3/main.cpp
• examples/example_glfw_vulkan/main.cpp
• examples/example_glut_opengl2/main.cpp
• examples/example_marmalade/main.cpp
• examples/example_sdl_directx11/build_win32.bat
• examples/example_sdl_directx11/example_sdl_directx11.vcxproj
• examples/example_sdl_directx11/example_sdl_directx11.vcxproj.filters
• examples/example_sdl_directx11/main.cpp
• examples/example_sdl_opengl2/main.cpp
• examples/example_sdl_opengl3/main.cpp
• examples/example_sdl_vulkan/main.cpp
• examples/example_win32_directx11/main.cpp
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_sdl.cpp
• examples/imgui_impl_sdl.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/freetype/imgui_freetype.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View examples/README.txt

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

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

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

Ignore Space Show notes View examples/example_sdl_directx11/build_win32.bat 0 → 100644

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

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

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

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

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

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Show line notes below