omar 992736dc5d Merge branch 'refs/heads/master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h # imgui_widgets.cpp		2019-12-13 17:06:27 +01:00
..
build_win32.bat	Examples: Renamed example folders. (#1870)	2018-06-10 15:42:14 +02:00
example_glfw_opengl2.vcxproj	Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.	2019-04-15 15:48:38 +02:00
example_glfw_opengl2.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 'master' into docking	2019-11-26 12:23:43 +01:00
Makefile	Examples: Explicitly adding -DIMGUI_IMPL_OPENGL_LOADER_GL3W to Makefile to match linking settings	2019-12-06 10:43:27 +01:00