Fork: 0
mark / imgui
Browse code
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
docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64 v1.63 v1.62 v1.61 v1.60 v1.53 v1.52 v1.51 v1.50 v1.49 v1.48 v1.47 v1.46 v1.45 v1.44 v1.43
commit 25882c47a35a941534888fa2177cbf1f41d20d6b
2 parents 4d42760 + 502e360
@ocornut ocornut authored on 7 Jul 2015
Patch
Unified Split
Showing 7 changed files
View
examples/directx11_example/imgui_impl_dx11.cpp
View
examples/directx9_example/imgui_impl_dx9.cpp
View
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
View
examples/opengl_example/imgui_impl_glfw.cpp
View
imconfig.h
View
imgui.cpp
View
imgui.h