LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #2097 from Diapolo/fix_merges

Browse source 
fix small stuff related to the recent merge-wave
This commit is contained in:
Gavin Andresen 2012-12-12 10:42:26 -08:00
commit 5fe3f4652e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bitcoin-qt.pro
View file

@ -197,7 +197,8 @@ HEADERS += src/qt/bitcoingui.h \
src/netbase.h \ src/netbase.h \
src/clientversion.h \ src/clientversion.h \
src/txdb.h \ src/txdb.h \
src/leveldb.h src/leveldb.h \
src/threadsafety.h
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactiontablemodel.cpp \ src/qt/transactiontablemodel.cpp \