omar 6cc380fc41 Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp

2018-09-26 21:34:52 +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

example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036)

2018-09-09 21:09:58 +02:00

example_glfw_vulkan.vcxproj

example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036)

2018-09-09 21:09:58 +02:00

example_glfw_vulkan.vcxproj.filters

example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036)

2018-09-09 21:09:58 +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-09-26 21:34:52 +02:00