[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8.10-3-7-g0f6d47b

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 61dd9f032471900ee16f05f7215cde88c3eb5e45
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed May 15 21:00:43 2013 +0200

    Refreshed patches

diff --git a/debian/patches/debian_default_settings.patch b/debian/patches/debian_default_settings.patch
index 4da88e1..727a201 100644
--- a/debian/patches/debian_default_settings.patch
+++ b/debian/patches/debian_default_settings.patch
@@ -1,8 +1,8 @@
 Index: smuxi/src/Engine/Config/Config.cs
 ===================================================================
---- smuxi.orig/src/Engine/Config/Config.cs	2012-06-30 16:06:14.000000000 +0200
-+++ smuxi/src/Engine/Config/Config.cs	2012-06-30 16:13:36.000000000 +0200
-@@ -325,6 +325,7 @@
+--- smuxi.orig/src/Engine/Config/Config.cs	2013-05-15 20:09:40.014101882 +0200
++++ smuxi/src/Engine/Config/Config.cs	2013-05-15 20:09:40.010101882 +0200
+@@ -331,6 +331,7 @@
              Get(prefix + "OnConnectCommands",
                  new string[] {
                      "/join #smuxi",
diff --git a/debian/patches/ubuntu_default_settings.patch b/debian/patches/ubuntu_default_settings.patch
index 560b21a..34245c8 100644
--- a/debian/patches/ubuntu_default_settings.patch
+++ b/debian/patches/ubuntu_default_settings.patch
@@ -1,8 +1,8 @@
 Index: smuxi/src/Engine/Config/Config.cs
 ===================================================================
---- smuxi.orig/src/Engine/Config/Config.cs	2012-06-30 16:14:04.000000000 +0200
-+++ smuxi/src/Engine/Config/Config.cs	2012-06-30 16:16:33.000000000 +0200
-@@ -363,6 +363,12 @@
+--- smuxi.orig/src/Engine/Config/Config.cs	2013-05-15 20:11:07.638103744 +0200
++++ smuxi/src/Engine/Config/Config.cs	2013-05-15 20:11:07.634103744 +0200
+@@ -369,6 +369,12 @@
              Get(prefix + "Password", String.Empty);
              Get(prefix + "UseEncryption", false);
              Get(prefix + "ValidateServerCertificate", false);

-- 
smuxi