From 82460570998db86d5201acd1523fda44c93cd3d3 Mon Sep 17 00:00:00 2001
From: Lluis Sanchez <lluis@xamarin.com>
Date: Thu, 21 Nov 2013 18:51:45 +0100
Subject: Allow embedding .addin files into submodule assemblies

---
 Mono.Addins/Mono.Addins.Description/AddinDescription.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Mono.Addins/Mono.Addins.Description/AddinDescription.cs')

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;
 		}
 		
-- 
cgit v1.2.3