From: Ralf Jung <post@ralfj.de>
Date: Sat, 6 Oct 2012 10:39:15 +0000 (+0200)
Subject: Merge branch 'master' of git://ralfj.de/dsl
X-Git-Url: https://git.ralfj.de/lilass.git/commitdiff_plain/d45277d71a662b4174c9173922368d00cfbefa94?hp=--cc

Merge branch 'master' of git://ralfj.de/dsl
---

d45277d71a662b4174c9173922368d00cfbefa94
diff --cc dsl.py
index dad969a,396468d..c7ea0f9
--- a/dsl.py
+++ b/dsl.py
@@@ -16,12 -16,13 +16,12 @@@
  # along with this program (gpl.txt); if not, write to the Free Software
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
 -import os, sys, re, subprocess
 -from PyQt4 import QtGui
 +import os, re, subprocess
  from selector_window import PositionSelection
 -app = QtGui.QApplication(sys.argv)
 +import gui
  
  # for auto-config: common names of internal connectors
- commonInternalConnectorNames = ['LVDS', 'LVDS1']
+ commonInternalConnectorNames = ['LVDS', 'LVDS0', 'LVDS1', 'LVDS-0', 'LVDS-1']
  
  # Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
  def loadConfigFile(file):