Merge remote-tracking branch 'origin/master'

Browse Source

Conflicts:
	src/main/java/info/jbcs/minecraft/chisel/Chisel.java

...

This commit is contained in:

TheCricket committed 2014-11-02 16:58:29 -05:00

2 parents a1642c72c3 ac37f336fc

commit 2c2935e93f

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