diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-03 12:19:48 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-03 12:19:48 -0500 |
| commit | eb2a10afd600b2680f24d02ffc73d4c9d9800492 (patch) | |
| tree | 90538703868e2b1c04c76c41b7368f2d04d4add8 /src/qt/optionsdialog.cpp | |
| parent | 3b8051864b98eb5a9df6327f314a45af9205a09c (diff) | |
| parent | cc6bd19660461091903568803014b39d571fd458 (diff) | |
Merge branch '0.4.x' into 0.5.0.x
Conflicts:
src/util.cpp
Diffstat (limited to 'src/qt/optionsdialog.cpp')
0 files changed, 0 insertions, 0 deletions