1
0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-25 09:06:35 +00:00
imgui/examples/example_glfw_opengl3
Omar bb1e6f8af6 Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
2020-02-17 18:33:59 +01:00
..
build_win32.bat Examples: Fixes. 2018-06-23 09:42:47 +02:00
example_glfw_opengl3.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_opengl3.vcxproj.filters Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly () 2018-08-30 19:00:33 +02:00
main.cpp Merge branch 'master' into docking 2020-02-17 18:33:59 +01:00
Makefile Add glbinding build sample to Makefiles of GL3 examples. () 2020-01-09 16:26:42 +01:00