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

…

example_glfw_opengl3.vcxproj

…

example_glfw_opengl3.vcxproj.filters

…

main.cpp

…

Makefile

…