Merge branch 'release/1.5.5'

Shukuyen · Jul 8, 2013 · 832629f · 832629f
2 parents e73c9b8 + c2348a3
commit 832629f
Show file tree

Hide file tree

Showing 62 changed files with 1,061 additions and 682 deletions.
diff --git a/.gitignore b/.gitignore
@@ -106,3 +106,8 @@ Generated_Code #added for RIA/Silverlight projects
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
+
+
+# mpNZB related
+mpNZB/bin/
+mpNZB/obj/
diff --git a/Installer/mpNZB.dll b/Installer/mpNZB.dll