omar 4a43f347bb Merge branch 'viewport' into docking ...

# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_marmalade/main.cpp

2018-11-15 14:00:01 +01: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 'viewport' into docking

2018-11-15 14:00:01 +01:00