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

2015-07-07 12:15:35 -06:00

..

imgui_impl_glfw_gl3.cpp

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

2015-07-07 12:15:35 -06:00

imgui_impl_glfw_gl3.h

typo ImGui_ImplGlfwGL3_KeyCallback()

2015-03-18 21:02:29 +01:00

main.cpp

Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX

2015-05-18 18:26:16 -04:00

Makefile

Examples: Fixed Makefile

2015-03-14 11:29:09 +00:00

opengl3_example.vcxproj

Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples

2015-03-14 10:41:42 +00:00

opengl3_example.vcxproj.filters

Examples: Moved GLFW/GL3W to a common libs/ folder

2015-03-14 10:04:30 +00:00