You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
ocornut 377b864bb4 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
3 years ago
..
Makefile CI: Fixes for OSX + explicitely request C++11. 3 years ago
build_win32.bat Backends: OpenGL3: Embed our own minimal GL loader (amends). (#4445) 3 years ago
example_glfw_opengl3.vcxproj Backends: OpenGL3: Embed our own minimal GL loader based on gl3w and use it in SDL/GLFW examples. (#4445) 3 years ago
example_glfw_opengl3.vcxproj.filters Backends: OpenGL3: Embed our own minimal GL loader based on gl3w and use it in SDL/GLFW examples. (#4445) 3 years ago
main.cpp Merge branch 'master' into docking 3 years ago