diff --git a/manifest b/manifest index 98184c9..c605223 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Moved\sUICallback\sand\sScopedCallback\sto\sUtils -D 2015-04-30T11:43:31.832 +C Cosmetic\schanges +D 2015-04-30T12:00:47.495 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -184,7 +184,7 @@ F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038 F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342 F rsrc/resources.qrc 4098be128fd6c045db933d041fe8844b14643a6f -F src/Bridge.cpp 5e67a6fd18dd3fdbc7f94addb47f1a8e50064318 +F src/Bridge.cpp ec8e4c38ade150c41dcc8742d1322554979e8d03 F src/Bridge.h cc0d0128e2d286aa7d578d1213bed100ee4c458e F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597 @@ -201,7 +201,7 @@ F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 F src/MainWindow.cpp f6ffb8c6d1283a812084094426d51a5ea601fa35 -F src/MainWindow.h d91eda93c4b0ad4de12cfe8e0f069639f1842e95 +F src/MainWindow.h 4ce4e1cb3550ade8e41cbc5bcc465fdbcc13c342 F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43 F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca @@ -217,7 +217,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b -P 2e7553cddf1db1c9e22e883276829a8032dc9afb -R 20e7fdb7267d96eb9c994d7779618370 +P 717fb7a390f81af33ad40913960a30ff9c1c7a75 +R 4149161be33e3e42f7c8fdad15ae0fe3 U kostas -Z e23a9cc7623bde69f6e9e851375dd322 +Z 44567a8ac9cdb0509589b8c3a26665fa diff --git a/manifest.uuid b/manifest.uuid index 57bb451..1b2f82d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -717fb7a390f81af33ad40913960a30ff9c1c7a75 \ No newline at end of file +c7b15ab434e33f5b73833256e97e2fabed8f1451 \ No newline at end of file diff --git a/src/Bridge.cpp b/src/Bridge.cpp index af41135..9dee807 100644 --- a/src/Bridge.cpp +++ b/src/Bridge.cpp @@ -731,6 +731,7 @@ bool Bridge::runFossilRaw(const QStringList &args, QStringList *output, int *exi return true; } +//------------------------------------------------------------------------------ QString Bridge::getFossilPath() { // Use the user-specified fossil if available @@ -752,7 +753,6 @@ QString Bridge::getFossilPath() return fossil_exe; } - //------------------------------------------------------------------------------ bool Bridge::isWorkspace(const QString &path) { diff --git a/src/MainWindow.h b/src/MainWindow.h index 685b978..af0bf01 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -10,8 +10,6 @@ namespace Ui { class MainWindow; } - - ////////////////////////////////////////////////////////////////////////// // MainWindow //////////////////////////////////////////////////////////////////////////