diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2014-03-13 21:20:33 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2014-03-13 21:20:33 +0400 |
| commit | 19a4b8e782054f3f92939faf7d34c64fec45a7d9 (patch) | |
| tree | 89c03620b9b2071f269be86b173b54913e1387c4 /main/external | |
| parent | fef4f9ec3a21947f6cd1aae7b3b6979491a58f59 (diff) | |
| parent | 5ee8b1391d0b055f1a4563097845ee9b8e78c0c1 (diff) | |
Merge branch 'master' into retina
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs
Diffstat (limited to 'main/external')
| m--------- | main/external/nrefactory | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/main/external/nrefactory b/main/external/nrefactory -Subproject a35eafbb5de2b87c106564e77afbe42af9cbb78 +Subproject 0c4a81e21aa99f9e1df9e86551a13d90d8bd289 |