diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-03-03 13:02:33 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-03-03 13:02:33 +0400 |
| commit | a41e429b4cd5dc717a037b2086db03df06aa2740 (patch) | |
| tree | 765c29072a3661c056cfbcc14e15493cae92be73 /main/external | |
| parent | f2c2840ac9f3f29a01e4a7457e261a07f4ac1162 (diff) | |
| parent | 017cecfc1febb5580b94b21362f35bc0d963cc88 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
version-checks
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 7eaf69e3d99a82c32c9994c2f70329053591a73 +Subproject 5aded3faae91519fdd15f5b8b0f0daf1ffa3444 |