Merge pull request #2097 from Diapolo/fix_merges

fix small stuff related to the recent merge-wave
12 years ago · 5fe3f4652e
2 changed files with 5 additions and 4 deletions
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@ -197,7 +197,8 @@ HEADERS += src/qt/bitcoingui.h \
				@@ -197,7 +197,8 @@ HEADERS += src/qt/bitcoingui.h \
    src/netbase.h \
    src/clientversion.h \
    src/txdb.h \
-    src/leveldb.h
+    src/leveldb.h \
+    src/threadsafety.h

 SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
    src/qt/transactiontablemodel.cpp \