#
#
# patch "res/forms/changeset_browser.ui"
#  from [5a7e001d962135a3f120b356f96476eeb6d87eb8]
#    to [deb68bd9d92d4b2b53ed7bab2ef76e675085a4b1]
# 
# patch "src/view/DatabaseWindow.cpp"
#  from [279b0a3ffef1b844f50247b8cfce08770c010910]
#    to [d689dcb25dc8cf701fef79c4250b638c60a5808b]
# 
# patch "src/view/dialogs/ChangesetBrowser.cpp"
#  from [8bef25dfabd1c8bf365d48154d17f655910b0dd1]
#    to [bb4313d6d73e7cf525442755c01ec05445958927]
# 
# patch "src/view/panels/DatabaseVariables.cpp"
#  from [f6a69a4a3cdb36396813204fc5c9e2601ad909cf]
#    to [1029cec236764b98fc40314b55606723ff9206aa]
#
============================================================
--- res/forms/changeset_browser.ui	5a7e001d962135a3f120b356f96476eeb6d87eb8
+++ res/forms/changeset_browser.ui	deb68bd9d92d4b2b53ed7bab2ef76e675085a4b1
@@ -42,7 +42,7 @@
            <bool>true</bool>
           </property>
          </widget>
-         <widget class="QWidget" name="" >
+         <widget class="QWidget" name="layoutWidget" >
           <layout class="QVBoxLayout" >
            <item>
             <layout class="QHBoxLayout" >
============================================================
--- src/view/DatabaseWindow.cpp	279b0a3ffef1b844f50247b8cfce08770c010910
+++ src/view/DatabaseWindow.cpp	d689dcb25dc8cf701fef79c4250b638c60a5808b
@@ -82,8 +82,6 @@ void DatabaseWindow::init()
     dynamic_cast<DatabaseMenuBar *>(menuBar)
         ->addDockWidgetAction(databaseVariables->toggleViewAction());
 
-    addDockWidget(Qt::BottomDockWidgetArea, databaseVariables);
-
     MainWindow::init();
 }
 
============================================================
--- src/view/dialogs/ChangesetBrowser.cpp	8bef25dfabd1c8bf365d48154d17f655910b0dd1
+++ src/view/dialogs/ChangesetBrowser.cpp	bb4313d6d73e7cf525442755c01ec05445958927
@@ -28,6 +28,8 @@ ChangesetBrowser::ChangesetBrowser(QWidg
     this->setWindowFlags(this->windowFlags() | Qt::WindowMaximizeButtonHint);
     this->setWindowFlags(this->windowFlags() | Qt::WindowMinimizeButtonHint);
 
+    multipleParents->setVisible(false);
+
     branchesSplitter->restoreState();
     changesetsSplitter->restoreState();
     changeLogSplitter->restoreState();
@@ -141,6 +143,7 @@ void ChangesetBrowser::changesetsClicked
     changeLog->setHtml(changesetModel->data(revIdx, Qt::UserRole).toString());
     revisionModel->readDatabaseRevision(databaseFile, currentRevision);
     revisionParents->clear();
+    multipleParents->setVisible(false);
 }
 
 void ChangesetBrowser::initTreeWidget()
@@ -210,7 +213,12 @@ void ChangesetBrowser::updateParentsList
 
 void ChangesetBrowser::updateParentsList()
 {
-    revisionParents->addItems(revisionModel->getParentRevisions());
+    QStringList parentRevs = revisionModel->getParentRevisions();
+    if (parentRevs.size() > 1)
+    {
+        multipleParents->setVisible(true);
+        revisionParents->addItems(revisionModel->getParentRevisions());
+    }
 }
 
 void ChangesetBrowser::changeViewDoubleClicked(const QModelIndex & index)
============================================================
--- src/view/panels/DatabaseVariables.cpp	f6a69a4a3cdb36396813204fc5c9e2601ad909cf
+++ src/view/panels/DatabaseVariables.cpp	1029cec236764b98fc40314b55606723ff9206aa
@@ -25,6 +25,8 @@ DatabaseVariables::DatabaseVariables(QWi
     setWidget(parentWidget);
 
     setWindowTitle(tr("Database variables"));
+    setFloating(true);
+    setVisible(false);
     setAllowedAreas(Qt::BottomDockWidgetArea);
 }