From: Constantin <commit.suicide.enormator@xoxy.net>
Date: Tue, 16 Oct 2012 21:34:37 +0000 (+0200)
Subject: Merge branch 'master' of ralfj.de:dsl
X-Git-Url: https://git.ralfj.de/lilass.git/commitdiff_plain/33988e416bd971003f213d2bd04fc95104642ef8

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

33988e416bd971003f213d2bd04fc95104642ef8
diff --cc gui.py
index 0ae8958,a0fb3bb..25f71c2
--- a/gui.py
+++ b/gui.py
@@@ -12,10 -12,10 +12,10 @@@
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
- # along with this program (gpl.txt); if not, write to the Free Software
+ # along with this program; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
 -# This file bstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
 +# This file abstracts GUI stuff away, so that the actual dsl.py does not have to deal with it
  import sys
  from PyQt4 import QtGui
  from qt_dialogue import PositionSelection