DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of https://github.com/bitcoin/bitcoin

Browse Source 
Conflicts:
	.gitignore (used upstream version)
	bitcoin-qt.pro
This commit is contained in:
Wladimir J. van der Laan
2011-09-28 21:52:32 +02:00
parent a8b95ce6ed 4dcad1d294
commit 002a4dcad0
52 changed files with 530 additions and 15136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bitcoin-qt.pro
View File

@@ -12,6 +12,10 @@ CONFIG += no_include_pwd
# BOOST_LIB_PATH, BDB_INCLUDE_PATH, BDB_LIB_PATH
# OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
OBJECTS_DIR = build
MOC_DIR = build
UI_DIR = build
# use: qmake "USE_UPNP=1"
# miniupnpc (http://miniupnp.free.fr/files/) must be installed
count(USE_UPNP, 1) {