Deserialization #85

Merged
Atheros1 merged 7 commits from master into master 2013-03-29 21:43:26 +01:00

7 Commits

Author SHA1 Message Date
Jonathan Warren
c4c0286768 When flushing inventory in memory, clear items older than 5 minutes, not 60 minutes 2013-03-29 16:19:23 -04:00
Jonathan Warren
2911b61412 richtext or plaintext depends on sender 2013-03-29 16:01:31 -04:00
Jonathan Warren
cfd33175a6 syntax fix 2013-03-29 13:13:05 -04:00
Jonathan Warren
a60174f8ea handle strange edge case where we left off doing a POW and no longer have the recipients pubkey 2013-03-29 13:00:55 -04:00
Jonathan Warren
ce8de60d96 Better deserialization 2013-03-28 17:56:20 -04:00
Jonathan Warren
dda83acfe1 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-03-28 10:20:52 -04:00
Jonathan Warren
38e575f598 capitalized the B in address book per Github issue 74 2013-03-27 17:24:55 -04:00