Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2

Conflicts:
	build.properties
This commit is contained in:
Florian Nücke 2014-07-14 14:09:07 +02:00
commit fa4413fd56

View File

@ -1,6 +1,6 @@
minecraft.version=1.7.2
forge.version=10.12.2.1121
oc.version=1.3.0
oc.version=1.3.1
oc.subversion=
ccc.version=1.0.1.7
ccl.version=1.1.1.80