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

Browse Source

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

...

This commit is contained in:

ocornut

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

parent 4d42760c0b 502e360ee5

commit 25882c47a3

7 changed files with 217 additions and 227 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

380

imgui.cpp

File diff suppressed because it is too large Load Diff