git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3eb5fdb
c18b82d
)
Merge branch '0.4.x' into 0.5.x
author
Luke Dashjr
<luke-jr+git@utopios.org>
Fri, 27 Apr 2012 14:53:14 +0000 (10:53 -0400)
committer
Luke Dashjr
<luke-jr+git@utopios.org>
Fri, 27 Apr 2012 14:53:14 +0000 (10:53 -0400)
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/protocol.h
src/serialize.h
1
2
src/main.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/main.h
Simple merge