Merge pull request #2097 from Diapolo/fix_merges

fix small stuff related to the recent merge-wave

bitcoin-qt.pro

@@ -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 \