git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
02d5950
bdf6d65
)
Merge remote-tracking branch 'remotes/origin_project/master'
author
CryptoManiac
<balthazar@yandex.ru>
Sun, 3 Aug 2014 18:37:41 +0000 (22:37 +0400)
committer
CryptoManiac
<balthazar@yandex.ru>
Sun, 3 Aug 2014 18:37:41 +0000 (22:37 +0400)
1
2
src/wallet.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/wallet.h
Simple merge