diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2014-03-07 14:03:28 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2014-03-07 14:03:28 +0400 |
commit | 291064299685503a9228366c2ae50f3ca15cdd41 (patch) | |
tree | 707d33be39c4968d64d40bf07c1983b1a4c0b238 /version-checks | |
parent | 69e19bee14550cd3b621a42bbc4290a156d892c0 (diff) | |
parent | a77a3285026ea55412923dcecaa0fd1ab33bafc6 (diff) |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
version-checks
Diffstat (limited to 'version-checks')
-rwxr-xr-x | version-checks | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version-checks b/version-checks index 7df7dd2aac..1173a7a9c3 100755 --- a/version-checks +++ b/version-checks @@ -17,7 +17,7 @@ DEP[0]=md-addins DEP_NAME[0]=MDADDINS DEP_PATH[0]=${top_srcdir}/../md-addins DEP_MODULE[0]=git@github.com:xamarin/md-addins.git -DEP_NEEDED_VERSION[0]=b7f715089882fdc1aab8075aee14ba056bc6601b +DEP_NEEDED_VERSION[0]=0266b1ead2360d405ac8abe9525adbd34d7ed10c DEP_BRANCH_AND_REMOTE[0]="retina origin/retina" # heap-shot |