[Pkg-cli-apps-commits] [SCM] monobristol branch, master, updated. debian/0.60.2-1-13-g86b8555

[Stefan Ebner]

The following commit has been merged in the master branch:
commit 86b8555b951783205a96ca4da34feab03124a6a8
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Thu Dec 23 17:57:26 2010 +0100

    Revert "resolve conflict"
    
    This reverts commit c7c4cf7b47a4e1d41439367d1bdc1387736eab01.

diff --git a/MainWindow.cs b/MainWindow.cs
index 52833d9..139e415 100644
--- a/MainWindow.cs
+++ b/MainWindow.cs
@@ -296,9 +296,13 @@ public partial class MainWindow: Gtk.Window
 		
 		if (mode == "advanced") {
 			param = param + "-audio "+adriver+" -midi "+mdriver;
+<<<<<<< HEAD
+			if (adriver == "jack"){
+=======
 			if (adriver == "alsa"){
 				param = param+" -audiodev default ";
 			} if (adriver == "jack"){
+>>>>>>> upstream/0.60.3
 				if (autoa == "1"){
 					param = param+" -autoconn";
 				}

-- 
monobristol