Mercurial > hg > easyhg
diff src/changesetitem.h @ 399:b1f0fa991c49 item_appearance_adjustments
Use circle presentation for uncommitted merge as well as merge changeset
author | Chris Cannam |
---|---|
date | Wed, 25 May 2011 14:58:49 +0100 |
parents | ef31a55c86b6 |
children | 8bdc8f27d19c |
line wrap: on
line diff
--- a/src/changesetitem.h Wed May 25 14:48:42 2011 +0100 +++ b/src/changesetitem.h Wed May 25 14:58:49 2011 +0100 @@ -105,8 +105,8 @@ static QImage *m_star; bool isMerge() const; - virtual void paintNormal(QPainter *); - virtual void paintMerge(QPainter *); + void paintNormal(QPainter *); + void paintMerge(QPainter *); }; #endif // CHANGESETITEM_H