HomePhabricator

Merge remote-tracking branch 'upstream/master'
96df327834afUnpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/master'

Conflicts:
src/qt/overviewpage.cpp
src/qt/transactiondesc.cpp

Details

Provenance
Roy Badami <roy@gnomon.org.uk>Authored on Jul 7 2014, 21:06
schancelPushed on Jan 5 2018, 21:58
schancelPushed on Jan 5 2018, 21:39
schancelPushed on Jan 5 2018, 21:17
Parents
rSTAGING2e4fee2ac482: Show bitcoin quantities with full precision, even in the presence of trailing…
rSTAGING1fedd65fcf9a: Merge pull request #4480
Branches
Unknown
Tags
Unknown

Event Timeline

Roy Badami <roy@gnomon.org.uk> committed rSTAGING96df327834af: Merge remote-tracking branch 'upstream/master' (authored by Roy Badami <roy@gnomon.org.uk>).Jul 7 2014, 21:06

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.