# HG changeset patch
# User wenzelm
# Date 1400697382 -7200
# Node ID 362c8c64ec8327fef506a97548d1099d11d13506
# Parent  90d4db566e122b790cd6b5ec110c4a8d505996f4# Parent  2fdd5a0a1f9fcf54e4e81b22e8de11a8faa2fa1a
merged

diff -r 90d4db566e12 -r 362c8c64ec83 Admin/components/bundled-windows
--- a/Admin/components/bundled-windows	Wed May 21 18:55:34 2014 +0200
+++ b/Admin/components/bundled-windows	Wed May 21 20:36:22 2014 +0200
@@ -1,3 +1,3 @@
 #additional components to be bundled for release
-cygwin-20130916
+cygwin-20140521
 windows_app-20131201
diff -r 90d4db566e12 -r 362c8c64ec83 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Wed May 21 18:55:34 2014 +0200
+++ b/Admin/components/components.sha1	Wed May 21 20:36:22 2014 +0200
@@ -5,6 +5,7 @@
 1fde9ddf0fa4f398965113d0c0c4f0e97c78d008  cygwin-20130716.tar.gz
 a03735a53c2963eb0b453f6a7282d3419f28bf38  cygwin-20130916.tar.gz
 7470125fc46e24ee188bdaacc6d560e01b6fa839  cygwin-20140520.tar.gz
+db4dedae026981c5f001be283180abc1962b79ad  cygwin-20140521.tar.gz
 0fe549949a025d65d52d6deca30554de8fca3b6e  e-1.5.tar.gz
 2e293256a134eb8e5b1a283361b15eb812fbfbf1  e-1.6-1.tar.gz
 e1919e72416cbd7ac8de5455caba8901acc7b44d  e-1.6-2.tar.gz
@@ -70,6 +71,7 @@
 21c8ee274ffa471ab54d4196ecd827bf3d43e591  scala-2.10.3.tar.gz
 d4688ddaf83037ca43b5bf271325fc53ae70e3aa  scala-2.10.4.tar.gz
 44d12297a78988ffd34363535e6a8e0d94c1d8b5  scala-2.11.0.tar.gz
+14f20de82b25215a5e055631fb147356400625e6  scala-2.11.1.tar.gz
 b447017e81600cc5e30dd61b5d4962f6da01aa80  scala-2.8.1.final.tar.gz
 5659440f6b86db29f0c9c0de7249b7e24a647126  scala-2.9.2.tar.gz
 43b5afbcad575ab6817d2289756ca22fd2ef43a9  spass-3.8ds.tar.gz
diff -r 90d4db566e12 -r 362c8c64ec83 Admin/components/main
--- a/Admin/components/main	Wed May 21 18:55:34 2014 +0200
+++ b/Admin/components/main	Wed May 21 20:36:22 2014 +0200
@@ -9,7 +9,7 @@
 jortho-1.0-2
 kodkodi-1.5.2
 polyml-5.5.2
-scala-2.11.0
+scala-2.11.1
 spass-3.8ds
 z3-3.2-1
 z3-4.3.2pre
diff -r 90d4db566e12 -r 362c8c64ec83 Admin/lib/Tools/makedist_cygwin
--- a/Admin/lib/Tools/makedist_cygwin	Wed May 21 18:55:34 2014 +0200
+++ b/Admin/lib/Tools/makedist_cygwin	Wed May 21 20:36:22 2014 +0200
@@ -68,6 +68,8 @@
   rm "$TARGET/etc/$NAME"
 done
 
+ln -s cygperl5_14.dll "$TARGET/bin/cygperl5_14_2.dll"
+
 rm "$TARGET/Cygwin.bat"