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 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
7 years ago
..
Makefile Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++) 7 years ago
build_win32.bat Tweak build batch files and readmes 9 years ago
imgui_impl_glfw_gl3.cpp Merge branch 'context' 7 years ago
imgui_impl_glfw_gl3.h Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787) 7 years ago
main.cpp Merge branch 'context' 7 years ago
opengl3_example.vcxproj Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569) 7 years ago
opengl3_example.vcxproj.filters Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569) 7 years ago