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

2018-06-23 09:42:47 +02:00

example_glfw_opengl3.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_opengl3.vcxproj.filters

Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

2018-08-30 19:00:33 +02:00

main.cpp

Merge branch 'viewport' into docking

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

Makefile

Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

2018-08-30 19:00:33 +02:00