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 25882c47a3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/directx9_example/imgui_impl_dx9.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
	examples/opengl_example/imgui_impl_glfw.cpp
	imgui.cpp
9 years ago
..
Makefile Examples: Fixed Makefile 10 years ago
imgui_impl_glfw_gl3.cpp Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
imgui_impl_glfw_gl3.h typo ImGui_ImplGlfwGL3_KeyCallback() 10 years ago
main.cpp Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX 10 years ago
opengl3_example.vcxproj Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples 10 years ago
opengl3_example.vcxproj.filters Examples: Moved GLFW/GL3W to a common libs/ folder 10 years ago