aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-08-19 11:11:51 +0200
committerTechnus <daniel112092@gmail.com>2017-08-19 11:11:51 +0200
commitb7ccb8ea92698415cf24965e2d77e8609a92391e (patch)
tree0fa885d9dc658113692063dbc654a74ec2abda45
parent9bcccb4f7aacd2744737a4a6a939c7cd9d9fdfc4 (diff)
parentccc5ddf3b6eab0be2946b7cd32f57e4bd5d7bb8b (diff)
downloadGT5-Unofficial-b7ccb8ea92698415cf24965e2d77e8609a92391e.tar.gz
GT5-Unofficial-b7ccb8ea92698415cf24965e2d77e8609a92391e.tar.bz2
GT5-Unofficial-b7ccb8ea92698415cf24965e2d77e8609a92391e.zip
Merge branch 'master' into nh-recipes
# Conflicts: # build.properties
-rw-r--r--build.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.properties b/build.properties
index 16ddc4bb83..072c41c435 100644
--- a/build.properties
+++ b/build.properties
@@ -13,4 +13,4 @@ cofhcore.version=[1.7.10]3.0.3-303-dev
cofhlib.cf=2246/918
cofhlib.version=[1.7.10]1.0.3-175-dev
-yamcore.version=0.5.77 \ No newline at end of file
+yamcore.version=0.5.77