Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_sdl.cpp docking
commit b89202824e784a90ce7908a887ba627e2c356e48 2 parents f70eace + 35cbf9c omar authored on 15 Apr 2019

Showing 20 changed files

• docs/CHANGELOG.txt
• docs/README.md
• docs/TODO.txt
• examples/.gitignore
• examples/README.txt
• examples/example_allegro5/example_allegro5.vcxproj
• examples/example_emscripten/Makefile
• examples/example_emscripten/README.md
• examples/example_emscripten/main.cpp
• examples/example_emscripten/shell_minimal.html
• examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj
• examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj
• examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj
• examples/example_glut_opengl2/example_glut_opengl2.vcxproj
• examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj
• examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj
• examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj
• examples/example_win32_directx10/example_win32_directx10.vcxproj
• examples/example_win32_directx11/example_win32_directx11.vcxproj
• examples/example_win32_directx9/example_win32_directx9.vcxproj

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/.gitignore

Ignore Space Show notes View examples/README.txt

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

Ignore Space Show notes View examples/example_emscripten/Makefile 0 → 100644

Ignore Space Show notes View examples/example_emscripten/README.md 0 → 100644

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

Ignore Space Show notes View examples/example_emscripten/shell_minimal.html 0 → 100644

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

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

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

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

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

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

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

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

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

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

Show line notes below