[mono/monodevelop] [2 commits] 2cdebb49: [build] Ensure configure/Makefile are always checked out as lf

   Branch: refs/heads/license-sync
     Home: https://github.com/mono/monodevelop
  Compare: https://github.com/mono/monodevelop/compare/f4fe4a210e47...0fad750c48a2

   Commit: 2cdebb496461c25f9476e50f7252e14403a1e7db
   Author: Alan McGovern <[email protected]> (alanmcgovern)
     Date: 2013-10-26 21:43:54 GMT
      URL: https://github.com/mono/monodevelop/commit/2cdebb496461c25f9476e50f7252e14403a1e7db

[build] Ensure configure/Makefile are always checked out as lf

They must be lf so they execute correctly.

Conflicts:
	version-checks

Changed paths:
  M .gitattributes

Modified: .gitattributes
===================================================================
@@ -17,6 +17,15 @@
 # sln is always CRLF, even on linux, so don't convert
 *.sln	-crlf
 
+# configure and makefiles should be lf only
+configure
+configure.in
+configure.ac
+configure.sh
+Makefile
+Makefile.am
+Makefile.include
+
 # These files can be converted, since they're new
 .gitattributes	crlf
 .gitignore	crlf

   Commit: 0fad750c48a294934b8917952e6f1702e854efd4
   Author: Alan McGovern <[email protected]> (alanmcgovern)
     Date: 2013-10-26 21:44:12 GMT
      URL: https://github.com/mono/monodevelop/commit/0fad750c48a294934b8917952e6f1702e854efd4

bump md-addins

Changed paths:
  M version-checks

Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
 DEP_NAME[0]=MDADDINS
 DEP_PATH[0]=${top_srcdir}/../md-addins
 DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=5f543a3d9ff22681f4f6def6fe37caede45f50c1
+DEP_NEEDED_VERSION[0]=e80c43902484b168aa029535d90441e2157c4312
 DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
 
 # heap-shot


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches