cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-17 02:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,370 Commits 8 Branches 349 Tags
Commit Graph

147 Commits

Author SHA1 Message Date
Luke Dashjr
7083cc3083 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	contrib/debian/patches/1001_use_system_json-spirit.patch
	src/net.cpp
 2012-07-06 00:42:53 +00:00
fanquake
34709a786c build instructions: Qt is not uppercase 
(Upstream: 8b7b3be76529612ebe219e315a273d05066d2118)
 2012-07-05 22:39:31 +00:00
Luke Dashjr
fad2231f86 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/main.cpp
	src/serialize.h
 2012-06-20 19:02:33 +00:00
Gavin Andresen
0969343320 Document how to build/run unit tests 2012-06-18 16:07:53 +00:00
Gavin Andresen
fa57170187 Document how to build/run unit tests 2012-06-18 16:07:05 +00:00
Luke Dashjr
6ec9d30905 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.h
	src/net.cpp
	src/serialize.h
 2012-06-14 18:13:46 +00:00
Luke Dashjr
3703150d56 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	doc/release-process.txt
	src/serialize.h
 2012-06-14 18:07:11 +00:00
Matt Corallo
ca39829ecb Update wiki changelog at doc/release-process.txt 2012-06-14 17:21:05 +00:00
Chris Moore
7c4de78a5c "USE_UPNP=-" is needed to remove UPnP support. 2012-06-06 19:21:15 +00:00
Christian von Roques
fba681519a Fix typo. libarcode => libqrcode 2012-05-18 00:04:59 +00:00
Luke Dashjr
8fa3259664 Bump version to 0.6.0.8 2012-05-08 20:11:44 +00:00
Luke Dashjr
35a07f8ec4 Bump version to 0.5.6 2012-05-08 20:09:43 +00:00
Luke Dashjr
18b4eccddb Bump version to 0.4.7 2012-05-08 19:53:29 +00:00
Gavin Andresen
dd02f3ca6e Windows build: compile against openssl 1.0.1b 2012-04-27 13:57:17 -04:00
Gavin Andresen
b7a2b6e1aa Windows build: compile against openssl 1.0.1b 2012-04-27 13:51:12 -04:00
Gavin Andresen
5ad4028050 Windows build: compile against openssl 1.0.1b 2012-04-27 11:19:20 -04:00
Luke Dashjr
e5f43fe309 Bump version to 0.5.5 2012-04-27 10:55:06 -04:00
Luke Dashjr
c18b82d5db Bump version to 0.4.6 2012-04-27 10:50:24 -04:00
Luke Dashjr
3374c3ef09 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/sendcoinsdialog.cpp
	src/qt/sendcoinsdialog.h
	src/util.cpp
 2012-04-15 21:15:48 -04:00
Luke Dashjr
b7566fe29c Bump version to 0.6.0.7 
Skipping 0.6.0.1 through 0.6.0.6 since the internal version for 0.6.0[.0] was in fact 0.6.0.6
 2012-04-15 13:08:21 -04:00
Luke Dashjr
892fcaf291 Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	src/qt/notificator.h
 2012-04-06 16:34:34 -04:00
Luke Dashjr
a93bb51604 Merge branch 'strlcpy_attribute' into 0.5.0.x 2012-04-05 19:43:06 -04:00
Luke Dashjr
7993454a92 Document strlcpy.h in assets-attribution.txt since it isn't MIT-licensed 2012-04-05 18:58:20 -04:00
Luke Dashjr
9a133240d3 Merge branch '0.5.0.x' into 0.5.x 2012-03-26 20:07:28 -04:00
Luke Dashjr
68d889db34 Fix grammatical errors in translation process documentation (partial of 2fac102) 2012-03-22 16:15:30 -04:00
Philip Kaufmann
2fac1028a8 updated translation process documentation 2012-03-21 18:41:11 +01:00
Luke Dashjr
0a1c5c9b10 Bump version to 0.5.0.6 2012-03-19 12:15:03 -04:00
Luke Dashjr
7f23df06d7 Bump version to 0.5.4 2012-03-16 16:12:16 -04:00
Luke Dashjr
f322aa4d60 Bump version to 0.5.0.5 2012-03-16 16:11:11 -04:00
Luke Dashjr
ffef16404d Bump version to 0.4.5 2012-03-16 16:04:26 -04:00
Nils Schneider
6c757e99f3 add shell one-liner for updating translations in bitcoin.qrc 2012-03-16 19:03:43 +01:00
Gavin Andresen
50abb5516d Updated Mac build process 2012-02-29 21:04:56 -05:00
Matt Corallo
95486d5c48 Fix release-process.txt for new deps zip. 2012-02-29 16:12:36 -05:00
Matt Corallo
3d0a0a9b9e Make deps build deterministic and upgrade to libpng 1.5.9. 2012-02-22 22:09:06 -05:00
sje397
4efbda3f25 Added 'Backup Wallet' menu option 
- icon from the LGPL Nuvola set (like the tick) - http://www.icon-king.com/projects/nuvola/
- include 'boost/version.hpp' in db.cpp so that the overwrite version of copy can be used
- catch exceptions in BackupWallet (e.g. filesystem_error thrown when trying to overwrite without the overwrite flag set)
- include db.h in walletmodel.cpp for BackupWallet function
- updated doc/assets-attribution.txt and contrib/debian/copyright with copyright info for new icon
 2012-02-15 23:29:59 +11:00
Luke Dashjr
a21e4da901 Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-02-07 22:49:03 -05:00
Luke Dashjr
b5d9c7d9fb Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-02-07 22:46:07 -05:00
Luke Dashjr
4664aae3fe Update copyrights to 2012 for files modified this year 2012-02-07 22:30:50 -05:00
Wladimir J. van der Laan
328b26d40b Update readme-qt.rst for 0.6.0 
- Remove features list (no longer makes sense)
- Document USE_QRCODE
 2012-02-07 21:16:28 +01:00
Gavin Andresen
a15bc17632 Merge pull request #805 from luke-jr/gitian_deps 
Split dependencies into deps-gitian.yml
 2012-02-07 09:23:34 -08:00
Luke Dashjr
f1142dcc5b Update doc/release-process.txt 2012-02-07 12:12:10 -05:00
Gavin Andresen
882164196e Update all copyrights to 2012 2012-02-07 11:28:30 -05:00
Gavin Andresen
6bf4253a68 Increase client version to 0.6 2012-02-07 11:22:09 -05:00
p2k
f118b5fc5d miniupnpc Porfile removed; new and improved macdeployqtplus 
* My patch for miniupnpc has made it into the latest MacPorts release: https://trac.macports.org/ticket/31354
* Documentation has been changed appropriately
* New pure-Python macdeployqt; leverages all problems with the stock macdeployqt
 2012-02-06 09:33:12 -05:00
Luke Dashjr
a0db9a79e5 Merge branch '0.5.0.x' into 0.5.x 2012-01-23 22:45:47 -05:00
Luke Dashjr
3d3f9cd120 Various updates to the release process 2012-01-23 22:44:02 -05:00
Luke Dashjr
5df1a22c2e Various updates to the release process 2012-01-23 22:43:47 -05:00
Luke Dashjr
9965e1d044 Various updates to the release process 2012-01-17 21:50:08 -05:00
Luke Dashjr
98811f6ad4 Bump version to 0.5.3 2012-01-10 15:58:29 -05:00
Luke Dashjr
507848b63d Bump version to 0.5.0.4 2012-01-10 15:54:38 -05:00