Files
dragonx/bitcoin-qt.pro
Wladimir J. van der Laan 002a4dcad0 Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
	.gitignore (used upstream version)
	bitcoin-qt.pro
2011-09-28 21:52:32 +02:00

6.8 KiB