diff options
| author | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-20 19:07:51 +0300 |
|---|---|---|
| committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-20 19:07:51 +0300 |
| commit | 95408b1a41b31b645f3a8c3323ab7d3ca4bff26b (patch) | |
| tree | f8f137cddcb9a40499d303be95722fd2c6081bce /version-checks | |
| parent | b70e4e04b4e41b8ec28d7e4b220b401ecf467e7a (diff) | |
| parent | de043d330a8bf5855d4d983c804cd36727cb2406 (diff) | |
Merge remote-tracking branch 'origin/roslyn' into new-project-model
Diffstat (limited to 'version-checks')
| -rwxr-xr-x | version-checks | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/version-checks b/version-checks index 6d85a24765..afb52e45ad 100755 --- a/version-checks +++ b/version-checks @@ -17,15 +17,20 @@ 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 +<<<<<<< HEAD DEP_NEEDED_VERSION[0]=6d12a0fa86dfea73b8bfde67cc960decd59efae7 DEP_BRANCH_AND_REMOTE[0]="new-project-model origin/new-project-model" +======= +DEP_NEEDED_VERSION[0]=72883b1936ad1211e553cb49b4496160cbff7cc6 +DEP_BRANCH_AND_REMOTE[0]="roslyn origin/roslyn" +>>>>>>> origin/roslyn # heap-shot DEP[1]=heap-shot DEP_NAME[1]=HEAPSHOT DEP_PATH[1]=${top_srcdir}/../heap-shot DEP_MODULE[1]=git://github.com/mono/heap-shot.git -DEP_NEEDED_VERSION[1]=8822b2285aa09daae71c48f4a1ebf73be751155c +DEP_NEEDED_VERSION[1]=30d34139b33e908356cdf7007e0f84d8cc483f60 DEP_BRANCH_AND_REMOTE[1]="master origin/master" # other dependencies |