Mercurial > hg > easyhg
diff easyhg.pro @ 336:4229b6a8e9c6
Merge
author | Chris Cannam |
---|---|
date | Mon, 14 Mar 2011 10:00:29 +0000 |
parents | aa852b477e4d acfe9390d5c6 |
children | b9c153e00e84 |
line wrap: on
line diff
--- a/easyhg.pro Wed Mar 02 15:58:34 2011 +0000 +++ b/easyhg.pro Mon Mar 14 10:00:29 2011 +0000 @@ -59,7 +59,8 @@ settingsdialog.h \ clickablelabel.h \ workstatuswidget.h \ - moreinformationdialog.h + moreinformationdialog.h \ + annotatedialog.h SOURCES = main.cpp \ mainwindow.cpp \ hgtabwidget.cpp \ @@ -91,7 +92,8 @@ uncommitteditem.cpp \ settingsdialog.cpp \ workstatuswidget.cpp \ - moreinformationdialog.cpp + moreinformationdialog.cpp \ + annotatedialog.cpp macx-* { SOURCES += common_osx.mm