From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 4 Apr 2012 14:32:09 +0000 (-0400)
Subject: Merge branch '0.5.x' into 0.6.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~29
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=1376cd9d7f1d7df4395d5d686450bde44e260785

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	bitcoin-qt.pro
	contrib/debian/changelog
	doc/README
	doc/README_windows.txt
	doc/translation_process.md
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/db.cpp
	src/init.cpp
	src/irc.cpp
	src/main.cpp
	src/main.h
	src/makefile.osx
	src/makefile.unix
	src/net.cpp
	src/net.h
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
	src/qt/sendcoinsdialog.h
	src/qt/transactionrecord.cpp
	src/script.cpp
	src/script.h
	src/serialize.h
	src/util.cpp
	src/util.h
---

1376cd9d7f1d7df4395d5d686450bde44e260785
diff --cc contrib/gitian-descriptors/gitian-win32.yml
index 9e372c7,0f46709..4f299c4
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@@ -10,9 -10,10 +10,9 @@@ packages
  - "unzip"
  - "nsis"
  - "faketime"
 -- "wine"
  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"
diff --cc contrib/gitian-descriptors/gitian.yml
index 086e097,11ee4dc..52056b3
--- a/contrib/gitian-descriptors/gitian.yml
+++ b/contrib/gitian-descriptors/gitian.yml
@@@ -16,11 -16,9 +16,11 @@@ packages
  - "libssl-dev"
  - "git-core"
  - "unzip"
 +- "pkg-config"
 +- "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"