Mercurial > hg > easyhg
annotate repositorydialog.h @ 318:124a3ea9fafb easyhg_v0.4
Merge, and add a helpful warning when you try to push before committing your merge (I just did this and the ensuing warning was misleading)
author | Chris Cannam |
---|---|
date | Wed, 02 Mar 2011 12:38:17 +0000 |
parents | 8fd71f570884 |
children |
rev | line source |
---|---|
Chris@67 | 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ |
Chris@67 | 2 |
Chris@67 | 3 /* |
Chris@67 | 4 EasyMercurial |
Chris@67 | 5 |
Chris@67 | 6 Based on HgExplorer by Jari Korhonen |
Chris@67 | 7 Copyright (c) 2010 Jari Korhonen |
Chris@244 | 8 Copyright (c) 2011 Chris Cannam |
Chris@244 | 9 Copyright (c) 2011 Queen Mary, University of London |
Chris@67 | 10 |
Chris@67 | 11 This program is free software; you can redistribute it and/or |
Chris@67 | 12 modify it under the terms of the GNU General Public License as |
Chris@67 | 13 published by the Free Software Foundation; either version 2 of the |
Chris@67 | 14 License, or (at your option) any later version. See the file |
Chris@67 | 15 COPYING included with this distribution for more information. |
Chris@67 | 16 */ |
Chris@67 | 17 |
Chris@67 | 18 #ifndef REPOSITORYDIALOG_H |
Chris@67 | 19 #define REPOSITORYDIALOG_H |
Chris@67 | 20 |
Chris@67 | 21 #include <QDialog> |
Chris@67 | 22 |
Chris@67 | 23 class RepositoryDialog : public QDialog |
Chris@67 | 24 { |
Chris@67 | 25 Q_OBJECT |
Chris@67 | 26 |
Chris@67 | 27 public: |
Chris@67 | 28 RepositoryDialog(QWidget *parent = 0); |
Chris@67 | 29 |
Chris@67 | 30 |
Chris@67 | 31 |
Chris@67 | 32 }; |
Chris@67 | 33 |
Chris@67 | 34 #endif // REPOSITORYDIALOG_H |