Merge branch 'master' into dev

Browse Source

Conflicts:
	plugin.xml

...

This commit is contained in:

Andrew Grieve

2014-02-27 16:03:32 -05:00

parent 61a963d6fb 552b806347

commit 2a7520112e

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