Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFix
Signed-off-by: Jonas Schnelli <jonas.schnelli@include7.ch>
Conflicts:
bitcoin-qt.pro
Description
Description
Details
Details
- Provenance
Jonas Schnelli <jonas.schnelli@include7.ch> Authored on Jun 3 2013, 13:18 schancel Pushed on Jan 5 2018, 21:58 schancel Pushed on Jan 5 2018, 21:39 schancel Pushed on Jan 5 2018, 21:17 - Parents
- rSTAGINGf679b2900a3a: MaxOSX: settings fixes (#2371)
rSTAGINGfa9e5adddda0: Merge pull request #2672 from Diapolo/Qt_testnet - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Jonas Schnelli <jonas.schnelli@include7.ch> committed rSTAGING39fe9de6b2b2: Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFix (authored by Jonas Schnelli <jonas.schnelli@include7.ch>).Jun 3 2013, 13:182013-06-03 13:18:41 (UTC+0)
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
