aboutsummaryrefslogtreecommitdiff
path: root/bitcoin-qt.pro
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-01-10 15:54:25 -0500
committerLuke Dashjr <luke-jr+git@utopios.org>2012-01-10 15:54:25 -0500
commitcc19ba76e45aad5cfb108e270b11f42be7a7b94e (patch)
tree385b87911c760eb69fc975442415f007d24839db /bitcoin-qt.pro
parent2d8bc0e6da2203ba2ae62bb167110529e5b6f7d4 (diff)
parent6e1e62a04c79a93d124371fa102d7881449b3673 (diff)
Merge branch '0.4.x' into 0.5.0.x
Conflicts: contrib/Bitcoin.app/Contents/Info.plist doc/README doc/README_windows.txt share/setup.nsi src/serialize.h
Diffstat (limited to 'bitcoin-qt.pro')
0 files changed, 0 insertions, 0 deletions