Mercurial > hg > easyhg
diff easyhg.pro @ 293:7b4f42cfc596
Merge from branch "more_information_dialog"
author | Chris Cannam |
---|---|
date | Mon, 21 Feb 2011 18:17:18 +0000 |
parents | 1244dc3107cb |
children | d40294e164da |
line wrap: on
line diff
--- a/easyhg.pro Mon Feb 21 18:16:15 2011 +0000 +++ b/easyhg.pro Mon Feb 21 18:17:18 2011 +0000 @@ -49,7 +49,8 @@ incomingdialog.h \ uncommitteditem.h \ settingsdialog.h \ - clickablelabel.h + clickablelabel.h \ + moreinformationdialog.h SOURCES = main.cpp \ mainwindow.cpp \ hgtabwidget.cpp \ @@ -79,7 +80,8 @@ changesetscene.cpp \ incomingdialog.cpp \ uncommitteditem.cpp \ - settingsdialog.cpp + settingsdialog.cpp \ + moreinformationdialog.cpp macx-* { SOURCES += common_osx.mm