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
bitcoin/src
History
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
..
json
Back out spacing changes to json spirit code
2012-01-19 14:32:45 -05:00
obj
Boost unit-testing framework.
2011-06-27 14:12:48 -04:00
obj-test
Rename src/obj/test to src/obj-test to workaround bug in older GNU Make
2012-02-02 17:29:50 -05:00
qt
Merge branch '0.5.x' into 0.6.0.x
2012-04-15 21:15:48 -04:00
test
CBitcoinSecret::SetString() now calls IsValid() to make sure it was passed something with the correct version.
2012-04-15 13:31:50 -04:00
addrman.cpp
fix warnings: '&&' within '||' [-Wlogical-op-parentheses]
2012-04-15 19:42:40 -04:00
addrman.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
base58.h
CBitcoinSecret::SetString() now calls IsValid() to make sure it was passed something with the correct version.
2012-04-15 13:31:50 -04:00
bignum.h
Merge branch '0.5.x' into 0.6.0.x
2012-04-15 21:15:48 -04:00
bitcoinrpc.cpp
Merge branch '0.5.x' into 0.6.0.x
2012-04-15 21:15:48 -04:00
bitcoinrpc.h
Update all copyrights to 2012
2012-02-07 11:28:30 -05:00
checkpoints.cpp
Checkpoint block 168,000
2012-02-27 13:00:23 -05:00
checkpoints.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
compat.h
Update all copyrights to 2012
2012-02-07 11:28:30 -05:00
crypter.cpp
Merge branch '0.5.x' into 0.6.0.x
2012-04-05 18:22:47 -04:00
crypter.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
db.cpp
fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
2012-04-15 19:43:45 -04:00
db.h
Merge branch 'master' of github.com:bitcoin/bitcoin
2012-03-26 15:31:32 -04:00
headers.h
Merge branch '0.4.x' into 0.5.0.x
2012-02-07 22:46:07 -05:00
init.cpp
Introduce explicit -walletupgrade option
2012-03-22 23:47:29 +01:00
init.h
Update all copyrights to 2012
2012-02-07 11:28:30 -05:00
irc.cpp
Fix #626: RecvLine wrong error message
2012-02-27 12:54:06 -05:00
irc.h
Fix #626: RecvLine wrong error message
2012-02-19 19:06:42 +01:00
key.cpp
Update all copyrights to 2012
2012-02-07 11:28:30 -05:00
key.h
Merge branch 'vfycompsig_0.5.0' into 0.5.0.x
2012-03-27 20:10:46 -04:00
keystore.cpp
Merge branch '0.5.x' into 0.6.0.x
2012-04-05 18:22:47 -04:00
keystore.h
Merge branch '0.5.x' into 0.6.0.x
2012-04-15 21:15:48 -04:00
main.cpp
Merge branch '0.4.x' into 0.5.0.x
2012-04-15 21:05:54 -04:00
main.h
Merge branch '0.4.x' into 0.5.0.x
2012-04-15 21:05:54 -04:00
makefile.linux-mingw
CAddrMan: stochastic address manager
2012-02-24 13:41:04 +01:00
makefile.mingw
CAddrMan: stochastic address manager
2012-02-24 13:41:04 +01:00
makefile.osx
CAddrMan: stochastic address manager
2012-02-24 13:41:04 +01:00
makefile.unix
Fix testing setup
2012-04-04 10:00:20 -04:00
mruset.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
net.cpp
fix warnings: unused variable 'XX' [-Wunused-variable]
2012-04-15 19:40:58 -04:00
net.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
netbase.cpp
CAddrMan: stochastic address manager
2012-02-24 13:41:04 +01:00
netbase.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
noui.h
Merge branch '0.5.x' into 0.6.0.x
2012-04-04 15:43:29 -04:00
protocol.cpp
Update all copyrights to 2012
2012-02-07 11:28:30 -05:00
protocol.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
qtui.h
Bugfix: Replace "URL" with "URI" where we aren't actually working with URLs
2012-04-06 14:30:10 -04:00
rpcdump.cpp
Update all copyrights to 2012
2012-02-07 11:28:30 -05:00
script.cpp
fix warnings: unused variable 'XX' [-Wunused-variable]
2012-04-15 19:40:58 -04:00
script.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
serialize.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
strlcpy.h
move back to original directory structure
2011-06-11 22:11:58 +02:00
uint256.h
Merge branch '0.5.x' into 0.6.0.x
2012-04-15 21:15:48 -04:00
util.cpp
Merge branch '0.5.x' into 0.6.0.x
2012-04-15 21:15:48 -04:00
util.h
Begin doxygen-compatible comments
2012-03-26 16:48:23 +02:00
wallet.cpp
Merge branch '0.4.x' into 0.5.0.x
2012-04-15 21:05:54 -04:00
wallet.h
Merge branch '0.4.x' into 0.5.0.x
2012-04-15 21:05:54 -04:00