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.cpp

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

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

imgui_impl_glfw.h

Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.

2015-03-09 15:02:22 +00:00

main.cpp

Examples: initializing float + missing comment.

2015-04-03 12:11:41 +01:00

Makefile

Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted.

2015-03-09 11:25:15 +00:00

opengl_example.vcxproj

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

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

opengl_example.vcxproj.filters

Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted.

2015-03-09 11:25:15 +00:00