diff options
| author | Jérémie Laval <jeremie.laval@gmail.com> | 2013-11-22 23:30:33 +0400 |
|---|---|---|
| committer | Jérémie Laval <jeremie.laval@gmail.com> | 2013-11-22 23:30:33 +0400 |
| commit | cd02fcfb350930f468f3d7cbf8e39f940553d378 (patch) | |
| tree | a42ce9f2400866024734132ec3ff85235dfdbafb | |
| parent | 248d0f87f32ac995917f7e3151d5497ec9302430 (diff) | |
| parent | ee6cf08ac521c055a6708e5bb2bf5d116e9b27f7 (diff) | |
Merge branch 'master' into monodevelop-4.3.0-branchmonodevelop-4.3.0
Conflicts:
version-checks
| m--------- | main/external/xwt | 0 | ||||
| -rwxr-xr-x | version-checks | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/main/external/xwt b/main/external/xwt -Subproject 0f6541f64866b6f45efd111fa116adf93694f48 +Subproject d9d88153637c123554a1378e4665ef6edf99be5 diff --git a/version-checks b/version-checks index 5477c8e19b..869e27486d 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]=a4f45e73bb824050bcb8004637ea03cea5ae6751 +DEP_NEEDED_VERSION[0]=14d41853742c36662973f9bbc0d14e58befdebfb DEP_BRANCH_AND_REMOTE[0]="monodevelop-4.3.0-branch origin/monodevelop-4.3.0-branch" # heap-shot |