Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 5 Jan 2012 23:19:29 +0000 (18:19 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 5 Jan 2012 23:19:29 +0000 (18:19 -0500)
commit7de7913abdbaa30f0ef6ad1b63508d3a8441d08f
tree362441427efb06d822f635f366f7a28ce55d2958
parenta2e9767225d3c3fa55f31c2494a3a2f54a65f87f
parent780a1823177e851f75b6f22e7f7bfe49b7938862
Merge branch '0.5.0.x' into 0.5.x
src/qt/transactionrecord.h
src/serialize.h