comparison easyhg.pro @ 583:e40e3ebe9f2e fswatcher

Merge from default branch
author Chris Cannam
date Mon, 12 Mar 2012 14:58:40 +0000
parents 930462068dcc
children 09b9849b9800
comparison
equal deleted inserted replaced
547:9f91d1b2ed51 583:e40e3ebe9f2e
63 src/moreinformationdialog.h \ 63 src/moreinformationdialog.h \
64 src/annotatedialog.h \ 64 src/annotatedialog.h \
65 src/hgignoredialog.h \ 65 src/hgignoredialog.h \
66 src/versiontester.h \ 66 src/versiontester.h \
67 src/squeezedlabel.h \ 67 src/squeezedlabel.h \
68 src/fswatcher.h 68 src/fswatcher.h \
69 src/findwidget.h
69 SOURCES = \ 70 SOURCES = \
70 src/main.cpp \ 71 src/main.cpp \
71 src/mainwindow.cpp \ 72 src/mainwindow.cpp \
72 src/hgtabwidget.cpp \ 73 src/hgtabwidget.cpp \
73 src/hgrunner.cpp \ 74 src/hgrunner.cpp \
101 src/moreinformationdialog.cpp \ 102 src/moreinformationdialog.cpp \
102 src/annotatedialog.cpp \ 103 src/annotatedialog.cpp \
103 src/hgignoredialog.cpp \ 104 src/hgignoredialog.cpp \
104 src/versiontester.cpp \ 105 src/versiontester.cpp \
105 src/squeezedlabel.cpp \ 106 src/squeezedlabel.cpp \
106 src/fswatcher.cpp 107 src/fswatcher.cpp \
108 src/findwidget.cpp
107 109
108 macx-* { 110 macx-* {
109 SOURCES += src/common_osx.mm 111 SOURCES += src/common_osx.mm
110 LIBS += -framework Foundation 112 LIBS += -framework Foundation
111 ICON = easyhg-icon.icns 113 ICON = easyhg-icon.icns