ocornut 43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering ...

Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp

2015-04-14 09:51:28 +01:00

..

imgui_impl_glfw_gl3.cpp

Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering

2015-04-14 09:51:28 +01:00

imgui_impl_glfw_gl3.h

typo ImGui_ImplGlfwGL3_KeyCallback()

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

main.cpp

Examples: initializing float + missing comment.

2015-04-03 12:11:41 +01: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