diff mainwindow.h @ 108:8ae3b44c0073

* Enable/disable update and merge actions depending on whether default update and merge will actually do anything
author Chris Cannam
date Thu, 25 Nov 2010 21:08:17 +0000
parents 729438d70af8
children 1721c580c10e
line wrap: on
line diff
--- a/mainwindow.h	Thu Nov 25 20:18:10 2010 +0000
+++ b/mainwindow.h	Thu Nov 25 21:08:17 2010 +0000
@@ -80,6 +80,7 @@
     QString workFolderPath;
     QString currentBranch;
     Changesets currentHeads;
+    Changesets currentParents;
 
 protected:
     void closeEvent(QCloseEvent *event);