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.
omar 36b2f64051 Merge branch 'master' into viewport
# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
6 years ago
..
Makefile Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. (#2001, #2002). Changelog, tweaks, applied changes to SDL+OpenGL3 example. 6 years ago
build_win32.bat Examples: Fixes. 6 years ago
example_glfw_opengl3.vcxproj Examples: Renamed example folders. (#1870) 6 years ago
example_glfw_opengl3.vcxproj.filters Examples: Renamed example folders. (#1870) 6 years ago
main.cpp Merge branch 'master' into viewport 6 years ago