# HG changeset patch # User Chris Cannam # Date 1294316576 0 # Node ID b286f26561c9bb7733147ab11dec4c7970f9da82 # Parent 5d8a5ce96163358d9406a3167e70cfb6d2f8b37b * Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here diff -r 5d8a5ce96163 -r b286f26561c9 mainwindow.cpp --- 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("

About EasyMercurial

" +#ifdef Q_OS_MAC + "" +#endif "

EasyMercurial is a simple user interface for the " "Mercurial version control system.

" "

Credits and Copyright

" @@ -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.

" +#ifdef Q_OS_MAC + "
" +#endif )); }