Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 24 Jan 2012 03:45:47 +0000 (22:45 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 24 Jan 2012 03:45:47 +0000 (22:45 -0500)
commita0db9a79e5b6b7226b7c3a3f61df30106eac304c
tree208a8a053bc072a57b5b3ecbf6b00d0c8390fb55
parent382e613ef59f5bb121dcfde98c41b764b9d426dc
parent8f378e98c5121f4f5c4936ef879f208f5f95bb5e
Merge branch '0.5.0.x' into 0.5.x
src/qt/transactionfilterproxy.h
src/util.h