omar 24aeca3d0c 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

2018-06-12 16:24:24 +02:00

..

build_win32.bat

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

example_win32_directx10.vcxproj

Fixed Travis path + various paths in comments/documentations

2018-06-10 16:14:43 +02:00

example_win32_directx10.vcxproj.filters

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

main.cpp

Merge branch 'master' into viewport

2018-06-10 15:59:35 +02:00