diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-03-05 19:43:00 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-03-05 19:43:00 +0400 |
| commit | 5555873aef7f4abf3f8aad8f1c9ff8dde4f24ea9 (patch) | |
| tree | fd163088a57c74944b459b6ff1713b24714e713a /main/external | |
| parent | 62118794d416b3e34e066540b8ae2368c89265f6 (diff) | |
| parent | 8378067a195a5a19a7580dfd7c5a88169b9308ff (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/core/Mono.Texteditor/Mono.TextEditor.csproj
Diffstat (limited to 'main/external')
| m--------- | main/external/mono-addins | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/main/external/mono-addins b/main/external/mono-addins -Subproject f2e9e9c991188cbaa7942da865636a31d80b755 +Subproject f21821cb82e8525ba3899c9840f24f3de5e3d99 |