Mercurial > hg > easyhg
changeset 228:b286f26561c9
* Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here
author | Chris Cannam |
---|---|
date | Thu, 06 Jan 2011 12:22:56 +0000 |
parents | 5d8a5ce96163 |
children | a1f4b5359051 |
files | mainwindow.cpp |
diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mainwindow.cpp Thu Jan 06 12:07:06 2011 +0000 +++ b/mainwindow.cpp Thu Jan 06 12:22:56 2011 +0000 @@ -155,6 +155,9 @@ { QMessageBox::about(this, tr("About EasyMercurial"), tr("<qt><h2>About EasyMercurial</h2>" +#ifdef Q_OS_MAC + "<font size=-1>" +#endif "<p>EasyMercurial is a simple user interface for the " "Mercurial</a> version control system.</p>" "<h4>Credits and Copyright</h4>" @@ -182,6 +185,9 @@ "published by the Free Software Foundation; either version 2 of the " "License, or (at your option) any later version. See the file " "COPYING included with this distribution for more information.</p>" +#ifdef Q_OS_MAC + "</font>" +#endif )); }