Mercurial > hg > easyhg
comparison 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 |
comparison
equal
deleted
inserted
replaced
287:3fbafca196e4 | 296:d40294e164da |
---|---|
48 changesetscene.h \ | 48 changesetscene.h \ |
49 incomingdialog.h \ | 49 incomingdialog.h \ |
50 uncommitteditem.h \ | 50 uncommitteditem.h \ |
51 settingsdialog.h \ | 51 settingsdialog.h \ |
52 clickablelabel.h \ | 52 clickablelabel.h \ |
53 workstatuswidget.h | 53 workstatuswidget.h \ |
54 moreinformationdialog.h | |
54 SOURCES = main.cpp \ | 55 SOURCES = main.cpp \ |
55 mainwindow.cpp \ | 56 mainwindow.cpp \ |
56 hgtabwidget.cpp \ | 57 hgtabwidget.cpp \ |
57 hgrunner.cpp \ | 58 hgrunner.cpp \ |
58 grapher.cpp \ | 59 grapher.cpp \ |
79 historywidget.cpp \ | 80 historywidget.cpp \ |
80 changesetscene.cpp \ | 81 changesetscene.cpp \ |
81 incomingdialog.cpp \ | 82 incomingdialog.cpp \ |
82 uncommitteditem.cpp \ | 83 uncommitteditem.cpp \ |
83 settingsdialog.cpp \ | 84 settingsdialog.cpp \ |
84 workstatuswidget.cpp | 85 workstatuswidget.cpp \ |
86 moreinformationdialog.cpp | |
85 | 87 |
86 macx-* { | 88 macx-* { |
87 SOURCES += common_osx.mm | 89 SOURCES += common_osx.mm |
88 LIBS += -framework Foundation | 90 LIBS += -framework Foundation |
89 ICON = easyhg.icns | 91 ICON = easyhg.icns |