git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd02f3c
824e8dd
)
Merge branch '0.5.x' into 0.6.0.x
author
Luke Dashjr
<luke-jr+git@utopios.org>
Fri, 27 Apr 2012 17:57:43 +0000 (13:57 -0400)
committer
Luke Dashjr
<luke-jr+git@utopios.org>
Fri, 27 Apr 2012 17:57:43 +0000 (13:57 -0400)
Conflicts:
contrib/gitian-descriptors/gitian-win32.yml
Trivial merge
git://git.novaco.in / novacoin.git / commitdiff