changeset 3:e7233f757372

Merge.
author Jari Korhonen <jtkorhonen@gmail.com>
date Sat, 24 Apr 2010 15:14:09 +0300
parents c19a4f858aab (current diff) e275d0b5d6ca (diff)
children 05e11c4ce616
files
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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>