1
0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-21 07:16:34 +00:00
imgui/examples/opengl2_example
omar f0364aa359 Merge branch 'context'
# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
2018-02-06 20:16:03 +01: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_gl2.cpp Merge branch 'context' 2018-02-06 20:16:03 +01:00
imgui_impl_glfw_gl2.h Examples: Organized header files to make available features more visible. 2018-02-05 20:34:11 +01:00
main.cpp Merge branch 'context' 2018-02-06 20:16:03 +01:00
Makefile Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++) 2018-01-29 00:55:16 +01:00
opengl2_example.vcxproj Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ () 2018-01-31 16:00:07 +01:00
opengl2_example.vcxproj.filters Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ () 2018-01-31 16:00:07 +01:00