summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
authorYoann Laissus <yoann.laissus@gmail.com>2012-02-09 18:40:21 +0100
committerYoann Laissus <yoann.laissus@gmail.com>2012-02-09 18:40:21 +0100
commitf5c45173623e39fb5ad67ae870c4bdfe5fe8520c (patch)
tree79e1703c95cf40c3d426f1ff1980bc50d6778028 /src/settings
parentFix right icon duplication in the UrlBar on some website (diff)
parentClean up sessionmanager mess :) (diff)
downloadrekonq-f5c45173623e39fb5ad67ae870c4bdfe5fe8520c.tar.xz
Merge branch 'master' of git://anongit.kde.org/rekonq
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/settingsdialog.cpp4
-rw-r--r--src/settings/settingsdialog.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 061430d3..ef01a32f 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
*
*
@@ -133,7 +133,7 @@ Private::Private(SettingsDialog *parent)
// WARNING
// remember wheh changing here that the smallest netbooks
// have a 1024x576 resolution. So DON'T bother that limits!!
- parent->setMinimumSize(700, 525);
+ parent->setMinimumSize(700, 576);
}
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index 98089990..40a2aeff 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
*
*