omar 5c4fda0fbc Merge branch 'master' into navigation ...

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

2017-09-06 19:17:51 +02:00

..

build_win32.bat

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:25:51 +02:00

imgui_impl_glfw.cpp

Merge branch 'master' into navigation

2017-09-06 19:17:51 +02:00

imgui_impl_glfw.h

Examples: GL2: rename functions to include GL2 in name

2017-09-01 16:45:31 +02:00

main.cpp

Examples: Main: Removed call to SetNextWindowSize()

2017-09-01 17:07:19 +02:00

Makefile

add SDL GL3 makefile

2017-07-02 21:38:27 -05:00

opengl2_example.vcxproj

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:25:51 +02:00

opengl2_example.vcxproj.filters

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:25:51 +02:00