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

Browse source

Conflicts:
	imgui.cpp
	imgui.h

...

This commit is contained in:

ocornut 2015-06-21 19:58:30 -06:00

parent 7d860a0181 0884cb51cd

commit 01cb0dc7f7

2 changed files with 694 additions and 481 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

1150

imgui.cpp

View file

File diff suppressed because it is too large Load diff