aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorJonas Schnelli <jonas.schnelli@include7.ch>2015-03-06 09:33:23 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-03-09 11:05:43 +0100
commit786cf72c7ff5d4042e7a7d010e96e53b0a597371 (patch)
tree03bc98f5d1f7589941db75a5c1985ec8e3efde4e /COPYING
parentaeb92792281b4cb9958f3defc9e36f63e65b778a (diff)
[Qt] fix a issue where "command line options"-action overwrite "Preference"-action (on OSX)
- fixes #5800 Conflicts: src/qt/bitcoingui.cpp Rebased-From: 9bbb880be44dbc378bdd3210eed42eaa77efb774 Github-Pull: #5858
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions