comparison changesetscene.h @ 312:f98c8ece3035

Merge from branch "new-branches-with-status-outside-tabs"
author Chris Cannam
date Tue, 01 Mar 2011 14:22:53 +0000
parents 4811eb34e819
children
comparison
equal deleted inserted replaced
310:b8ed12c2035f 312:f98c8ece3035
42 void commit(); 42 void commit();
43 void revert(); 43 void revert();
44 void diffWorkingFolder(); 44 void diffWorkingFolder();
45 void showSummary(); 45 void showSummary();
46 void showWork(); 46 void showWork();
47 void newBranch();
48 void noBranch();
47 49
48 void updateTo(QString id); 50 void updateTo(QString id);
49 void diffToParent(QString id, QString parent); 51 void diffToParent(QString id, QString parent);
50 void showSummary(Changeset *); 52 void showSummary(Changeset *);
51 void diffToCurrent(QString id); 53 void diffToCurrent(QString id);
52 void mergeFrom(QString id); 54 void mergeFrom(QString id);
55 void newBranch(QString id);
53 void tag(QString id); 56 void tag(QString id);
54 57
55 private slots: 58 private slots:
56 void changesetDetailShown(); 59 void changesetDetailShown();
57 void changesetDetailHidden(); 60 void changesetDetailHidden();