diff options
| author | Simon Lindgren <simon.n.lindgren@gmail.com> | 2013-08-06 02:29:44 +0400 |
|---|---|---|
| committer | Simon Lindgren <simon.n.lindgren@gmail.com> | 2013-08-06 02:29:44 +0400 |
| commit | 564b3974a9fceb7a93c01dc99d7d1fb48e1c1210 (patch) | |
| tree | 07f41906d71d53587d592099569e3f5711e1b98c /.gitmodules | |
| parent | de69eb3a75315c4c03c65947a63cf54320a20fc3 (diff) | |
| parent | b1fea560a91d56bc674a2704c873630a4e026d6d (diff) | |
Merge branch 'master' into flexible-grouping
Conflicts:
main/external/debugger-libs
main/external/monomac
main/external/nrefactory
main/external/xwt
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisRunner.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueProvider.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 71616e8408..36896e03da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "main/external/debugger-libs"] path = main/external/debugger-libs url = git://github.com/mono/debugger-libs.git +[submodule "main/external/guiunit"] + path = main/external/guiunit + url = git://github.com/mono/guiunit.git |