Merge branch 'ellipseshape' of github.com:libremapping/libremapping into ellipseshape

Browse Source

Conflicts:
	Shape.h

...

This commit is contained in:

Tats

2014-02-09 02:57:06 -05:00

parent b0f9a8ca5b a19714b919

commit dcdd67e0dd

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

Diff Content Not Available