highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 07:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,805 Commits 8 Branches 346 Tags
9845499fa14e76161e8b349bb7eccce69578492c
Commit Graph

182 Commits

Author SHA1 Message Date
Luke Dashjr
3241935774 Merge branch '0.6.0.x' into 0.6.x 2012-10-09 23:17:49 +00:00
fanquake
e25f0f0e53 Update Bugreport Links 
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
 2012-10-09 18:18:21 +00:00
Luke Dashjr
894ce6d88d Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_sv.ts
 2012-09-11 00:02:46 +00:00
Luke Dashjr
6d7b6681b6 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_pt_BR.ts
 2012-09-11 00:02:19 +00:00
Luke Dashjr
cae8742130 Apply MIT license to md2k7 art 
[21:48:14] <md2k7> feel free to make it MIT if you like
 2012-09-11 00:00:25 +00:00
fanquake
82bcb7bf80 Docs Tidy up 
Partial of f00a0dcfed.
 2012-09-10 23:59:42 +00:00
Gavin Andresen
dd2c101336 Minor documentation update 2012-09-06 20:42:39 +00:00
Luke Dashjr
661ca4136c Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/main.cpp
	src/main.h
 2012-08-27 19:20:30 +00:00
Luke Dashjr
f08ad34e0c Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
 2012-08-27 19:14:59 +00:00
Luke Dashjr
d31e24aeaa Merge branch '0.4.x' into 0.5.x 
Conflicts:
	contrib/Bitcoin.app/Contents/Info.plist
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
 2012-08-27 19:10:41 +00:00
Luke Dashjr
b9b15578bb Bump version to 0.4.8 2012-08-27 19:07:05 +00:00
Luke Dashjr
c195ef0b5c Merge branch '0.6.0.x' into 0.6.x 2012-08-12 17:36:55 +00:00
Luke Dashjr
4fb6e53968 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	doc/unit-tests.txt
 2012-08-12 17:35:44 +00:00
Luke Dashjr
566f556c40 Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:34:23 +00:00
Luke Dashjr
8ddc257a4b Merge branch '0.4.x' into 0.5.x 2012-08-12 17:33:03 +00:00
Luke Dashjr
448f6b3d9b Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:30:36 +00:00
Luke Dashjr
92dfcea0e9 Merge branch '0.6.0.x' into 0.6.x 2012-08-12 17:22:59 +00:00
Luke Dashjr
cafa8f2879 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
 2012-08-12 17:19:48 +00:00
Luke Dashjr
89c5c381b7 Merge branch '0.5.x' into 0.6.0.x 2012-08-12 17:14:29 +00:00
Luke Dashjr
797d0b231b Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/net.cpp
 2012-08-12 17:02:38 +00:00
Luke Dashjr
9e98fe6f58 Bugfix: Fix a variety of misspellings 
(PARTIAL: Left out anything changing debug.log)
 2012-08-12 17:00:02 +00:00
Luke Dashjr
9b1b1a06a1 Merge branch '0.4.x' into 0.5.x 2012-08-12 16:39:46 +00:00
fanquake
fb4dbbd188 Docs Tidy up 
(PARTIAL cherry pick)
 2012-07-22 23:38:26 +00:00
Luke Dashjr
e65f25d54e Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	contrib/debian/patches/1001_use_system_json-spirit.patch
	src/key.h
	src/main.cpp
	src/main.h
	src/net.cpp
 2012-07-06 00:54:24 +00:00
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: 8b7b3be765)
 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
23e7583a8c Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3 2012-06-19 16:34:10 -04:00
Gavin Andresen
db4036a829 Bump version numbers to 0.6.3 2012-06-19 14:44:38 -04: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
5e322a72f9 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	.gitignore
	src/bitcoinrpc.cpp
	src/main.cpp
	src/qt/bitcoingui.cpp
	src/ui_interface.h
	src/util.cpp
 2012-06-14 18:21:07 +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
Luke Dashjr
a49927a46d Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/bitcoinrpc.h
	src/db.h
	src/headers.h
	src/init.cpp
	src/main.cpp
	src/main.h
	src/noui.h
	src/qt/bitcoin.cpp
	src/qt/locale/bitcoin_en.ts
	src/qt/walletmodel.cpp
	src/script.cpp
	src/ui_interface.h
	src/util.cpp
 2012-05-22 23:07:46 +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
8ff1873096 Bump versions for 0.6.2 2012-05-08 12:58:39 -04:00
Gavin Andresen
397737b913 Bump version numbers for 0.6.1rc2 2012-05-04 10:22:26 -04: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
Gavin Andresen
2b4d7735b6 Windows build: compile against openssl 1.0.1b 2012-04-27 10:52:14 -04:00
Luke Dashjr
c18b82d5db Bump version to 0.4.6 2012-04-27 10:50:24 -04:00
Gavin Andresen
2c31cfc271 Bump version numbers for 0.6.1rc1 2012-04-27 10:14:33 -04:00