6 Commits

Author SHA1 Message Date
Luke Dashjr
6ec9d30905 Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	src/main.h
	src/net.cpp
	src/serialize.h
2012-06-14 18:13:46 +00:00
Matt Corallo
fdd907c9f1 Correct blockchain size in contrib/debian.
* Updates package description to note that blockchain now takes
  2+ GB instead of 150+ MB.

(PARTIAL of 8f6111bb9cd598954e9634d9fe4500fcf5ae83de)
2012-06-06 19:24:31 +00:00
Matt Corallo
b03cb15789 Make bitcoin-qt static-link libqrcode and add it for debian pkgs. 2012-02-15 16:39:01 -05:00
Matt Corallo
09308a3882 Remove mentions on anonymity in debian folder.
These should never have been there, bitcoin isnt anonymous without
a ton of work that virtually no users will ever be willing and
capable of doing.
2012-01-09 12:10:16 -05:00
Matt Corallo
65c82be021 Remove mentions on anonymity in debian folder.
These should never have been there, bitcoin isnt anonymous without
a ton of work that virtually no users will ever be willing and
capable of doing.
2012-01-07 13:38:43 -05:00
Matt Corallo
38f33ce4a3 Add debian build folder 2011-11-08 11:57:05 -05:00