git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b803009
)
Merge branch '0.4.x' into 0.5.x
author
Luke Dashjr
<luke-jr+git@utopios.org>
Tue, 8 May 2012 20:08:19 +0000 (20:08 +0000)
committer
Luke Dashjr
<luke-jr+git@utopios.org>
Tue, 8 May 2012 20:08:19 +0000 (20:08 +0000)
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
No differences found