diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2013-11-21 21:51:45 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2013-11-21 21:51:45 +0400 |
| commit | 82460570998db86d5201acd1523fda44c93cd3d3 (patch) | |
| tree | bdea8bd53843d5a4f63c43e995badc71466c4fae /Mono.Addins/Mono.Addins.Description/AddinDescription.cs | |
| parent | 2691fedc346af1320781fe1a0b2d0c68fc18d937 (diff) | |
Allow embedding .addin files into submodule assembliessm-with-config
Diffstat (limited to 'Mono.Addins/Mono.Addins.Description/AddinDescription.cs')
| -rw-r--r-- | Mono.Addins/Mono.Addins.Description/AddinDescription.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Mono.Addins/Mono.Addins.Description/AddinDescription.cs b/Mono.Addins/Mono.Addins.Description/AddinDescription.cs index 3799751..00eaaf2 100644 --- a/Mono.Addins/Mono.Addins.Description/AddinDescription.cs +++ b/Mono.Addins/Mono.Addins.Description/AddinDescription.cs @@ -1193,8 +1193,7 @@ namespace Mono.Addins.Description desc1.MainModule.Assemblies.Add (s); foreach (string s in desc2.MainModule.DataFiles) desc1.MainModule.DataFiles.Add (s); - desc1.MainModule.Dependencies.AddRange (desc2.MainModule.Dependencies); - desc1.MainModule.Extensions.AddRange (desc2.MainModule.Extensions); + desc1.MainModule.MergeWith (desc2.MainModule); return desc1; } |