Mercurial > hg > bitcoin

changeset 2969:6d9afd854c97 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch '0.6.0.x' into 0.6.x Conflicts: bitcoin-qt.pro contrib/gitian-descriptors/gitian-win32.yml doc/README doc/README_windows.txt share/qt/make_windows_icon.sh share/setup.nsi src/bitcoinrpc.cpp src/main.cpp src/main.h src/makefile.linux-mingw src/net.cpp src/net.h src/netbase.h src/noui.h src/qt/addressbookpage.cpp src/qt/bitcoin.cpp src/qt/bitcoingui.cpp src/qt/bitcoingui.h src/qt/bitcoinstrings.cpp src/qt/guiutil.cpp src/qt/guiutil.h src/qt/optionsmodel.cpp src/qt/qrcodedialog.cpp src/qt/qtipcserver.cpp src/script.cpp src/serialize.h src/ui_interface.h src/uint256.h
author Luke Dashjr <luke-jr+git@utopios.org>
date Sat, 05 May 2012 16:13:56 +0000
parents 23aee40b435b (current diff) 04987f8907d6 (diff)
children 95b6e23d3f2a
files bitcoin-qt.pro contrib/gitian-descriptors/gitian-win32.yml contrib/gitian-descriptors/gitian.yml contrib/gitian-downloader/linux-download-config contrib/gitian-downloader/win32-download-config doc/README doc/README_windows.txt doc/assets-attribution.txt doc/release-process.txt share/setup.nsi src/base58.h src/bignum.h src/bitcoinrpc.cpp src/checkpoints.cpp src/crypter.cpp src/db.cpp src/db.h src/init.cpp src/irc.cpp src/key.h src/keystore.cpp src/keystore.h src/main.cpp src/main.h src/makefile.linux-mingw src/makefile.mingw src/makefile.osx src/makefile.unix src/net.cpp src/net.h src/netbase.h src/protocol.cpp src/protocol.h src/qt/addressbookpage.cpp src/qt/addresstablemodel.cpp src/qt/bitcoin.cpp src/qt/bitcoingui.cpp src/qt/bitcoingui.h src/qt/bitcoinstrings.cpp src/qt/clientmodel.h src/qt/forms/qrcodedialog.ui src/qt/guiutil.cpp src/qt/guiutil.h src/qt/locale/bitcoin_en.ts src/qt/optionsdialog.cpp src/qt/optionsmodel.cpp src/qt/qrcodedialog.cpp src/qt/sendcoinsdialog.cpp src/qt/sendcoinsdialog.h src/qt/transactionrecord.cpp src/qt/transactiontablemodel.cpp src/qt/walletmodel.h src/script.cpp src/script.h src/serialize.h src/test/script_tests.cpp src/uint256.h src/util.cpp src/util.h src/wallet.cpp src/wallet.h
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@ -12,7 +12,7 @@
 - "faketime"
 reference_datetime: "2011-01-30 00:00:00"
 remotes:
-- "url": "https://github.com/bitcoin/bitcoin.git"
+- "url": "https://git.gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git"
   "dir": "bitcoin"
 files:
 - "qt-win32-4.7.4-gitian.zip"
--- a/contrib/gitian-descriptors/gitian.yml
+++ b/contrib/gitian-descriptors/gitian.yml
@@ -20,7 +20,7 @@
 - "libpng12-dev"
 reference_datetime: "2011-01-30 00:00:00"
 remotes:
-- "url": "https://github.com/bitcoin/bitcoin.git"
+- "url": "https://git.gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git"
   "dir": "bitcoin"
 files:
 - "miniupnpc-1.6.tar.gz"
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -7,12 +7,12 @@
 INCLUDEPATHS= \
  -I"C:\boost-1.47.0-mgw" \
  -I"C:\db-4.8.30.NC-mgw\build_unix" \
- -I"C:\openssl-1.0.0d-mgw\include"
+ -I"C:\openssl-1.0.1b-mgw\include"
 
 LIBPATHS= \
  -L"C:\boost-1.47.0-mgw\stage\lib" \
  -L"C:\db-4.8.30.NC-mgw\build_unix" \
- -L"C:\openssl-1.0.0d-mgw"
+ -L"C:\openssl-1.0.1b-mgw"
 
 LIBS= \
  -l boost_system-mgw45-mt-s-1_47 \