diff easyhg.pro @ 548:dca5bd5b2a06

Merge from branch "fswatcher"
author Chris Cannam
date Tue, 14 Feb 2012 17:55:39 +0000
parents 9f91d1b2ed51
children 930462068dcc
line wrap: on
line diff
--- a/easyhg.pro	Fri Feb 10 13:08:07 2012 +0000
+++ b/easyhg.pro	Tue Feb 14 17:55:39 2012 +0000
@@ -1,5 +1,5 @@
 
-CONFIG += debug
+CONFIG += release
 
 TEMPLATE = app
 TARGET = EasyMercurial
@@ -64,7 +64,8 @@
     src/annotatedialog.h \
     src/hgignoredialog.h \
     src/versiontester.h \
-    src/squeezedlabel.h
+    src/squeezedlabel.h \
+    src/fswatcher.h
 SOURCES = \
     src/main.cpp \
     src/mainwindow.cpp \
@@ -101,7 +102,8 @@
     src/annotatedialog.cpp \
     src/hgignoredialog.cpp \
     src/versiontester.cpp \
-    src/squeezedlabel.cpp
+    src/squeezedlabel.cpp \
+    src/fswatcher.cpp
 
 macx-* {
     SOURCES += src/common_osx.mm