omar 352695bc57 Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp

2018-07-24 16:50:49 +02:00

..

build_win32.bat

Examples: Renamed example folders. (#1870)

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

example_win32_directx12.vcxproj

Fixed Travis path + various paths in comments/documentations

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

example_win32_directx12.vcxproj.filters

Examples: Renamed example folders. (#1870)

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

main.cpp

Merge branch 'master' into viewport

2018-07-24 16:50:49 +02:00