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

Browse Source

Conflicts:
	imgui.cpp
	imgui.h

...

This commit is contained in:

ocornut

2015-03-19 17:01:54 +00:00

parent 2a04c2a7bb ff5378bd66

commit 138e292c4b

10 changed files with 771 additions and 397 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

1081

imgui.cpp

File diff suppressed because it is too large Load Diff