omar 770cba0bd0 Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
#	imgui_internal.h

2018-07-02 20:13:16 +02:00

..

build_win32.bat

Examples: Renamed example folders. (#1870)

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

build_win64.bat

Examples: Renamed example folders. (#1870)

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

CMakeLists.txt

Fix include Example_glfw_vulkan cmake (#1916)

2018-06-30 10:53:36 +02:00

example_glfw_vulkan.vcxproj

Examples: Renamed example folders. (#1870)

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

example_glfw_vulkan.vcxproj.filters

Examples: Renamed example folders. (#1870)

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

gen_spv.sh

Examples: Renamed example folders. (#1870)

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

glsl_shader.frag

Examples: Renamed example folders. (#1870)

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

glsl_shader.vert

Examples: Renamed example folders. (#1870)

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

main.cpp

Merge branch 'master' into viewport

2018-06-22 12:01:42 +02:00