Mercurial > hg > easyhg
diff easyhg.pro @ 296:d40294e164da status_outside_tabs
Merge from the default branch
author | Chris Cannam |
---|---|
date | Tue, 22 Feb 2011 13:03:03 +0000 |
parents | bc39f2e28da8 1244dc3107cb |
children | 2b2f0ba33262 |
line wrap: on
line diff
--- a/easyhg.pro Mon Feb 21 11:07:21 2011 +0000 +++ b/easyhg.pro Tue Feb 22 13:03:03 2011 +0000 @@ -50,7 +50,8 @@ uncommitteditem.h \ settingsdialog.h \ clickablelabel.h \ - workstatuswidget.h + workstatuswidget.h \ + moreinformationdialog.h SOURCES = main.cpp \ mainwindow.cpp \ hgtabwidget.cpp \ @@ -81,7 +82,8 @@ incomingdialog.cpp \ uncommitteditem.cpp \ settingsdialog.cpp \ - workstatuswidget.cpp + workstatuswidget.cpp \ + moreinformationdialog.cpp macx-* { SOURCES += common_osx.mm