omar 50ceb25003 Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_vulkan.cpp		2019-04-07 16:23:31 +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	Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.	2019-02-19 20:13:06 +01: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: Vulkan: Added shader sources/references in the .cpp source.	2019-04-03 11:23:54 +02:00
glsl_shader.vert	Examples: Vulkan: Added shader sources/references in the .cpp source.	2019-04-03 11:23:54 +02:00
main.cpp	Merge branch 'master' into docking	2019-04-07 16:23:31 +02:00