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

Event Timeline

Roy Badami <roy@gnomon.org.uk> committed rABC96df327834af: 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.