# HG changeset patch
# User Jari Korhonen <jtkorhonen@gmail.com>
# Date 1272111249 -10800
# Node ID e7233f757372d48c63bf61073390e8f5b29b1684
# Parent  c19a4f858aabda58c2c0416e9c42d51d936ed5ac# Parent  e275d0b5d6ca7623e82b1923cf20070c86071705
Merge.

diff -r c19a4f858aab -r e7233f757372 settingsdialog.cpp
--- a/settingsdialog.cpp	Sat Apr 24 15:12:12 2010 +0300
+++ b/settingsdialog.cpp	Sat Apr 24 15:14:09 2010 +0300
@@ -5,7 +5,6 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-
 SettingsDialog::SettingsDialog(QWidget *parent): QDialog(parent)
 {
     QPushButton *okButton;
diff -r c19a4f858aab -r e7233f757372 settingsdialog.h
--- a/settingsdialog.h	Sat Apr 24 15:12:12 2010 +0300
+++ b/settingsdialog.h	Sat Apr 24 15:14:09 2010 +0300
@@ -3,6 +3,7 @@
 
 #include "mainwindow.h"
 
+
 //** Copyright (C) Jari Korhonen, 2010 (under lgpl)
 
 #include <QDialog>