omar 87ded34f9f Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp

2019-02-22 12:29:18 +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

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: 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

2019-01-20 22:13:35 +01:00