Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComponents-MC1.6.4 into MC1.7

Browse Source

Conflicts:
	build.gradle
	build.properties

...

This commit is contained in:

Florian Nücke 2014-09-06 17:10:22 +02:00

parent 3b15454205 aa4601c276

commit 66ec34599a

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

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

Diff Content Not Available