diff options
| author | Keksoj <herrbosquet@gmail.com> | 2017-09-15 23:01:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 23:01:11 +0200 |
| commit | c712444e174e57aa083973ac91f458ce499787cf (patch) | |
| tree | 70df5c9c70773f7f9721c2270bf34e83c04a5e1c /MainApp.cpp | |
| parent | 3e90c3d8251a418387307f24fa039c739124ff05 (diff) | |
| parent | 4066cb22ea9e17c831f0f751911814d6fabefcdb (diff) | |
| download | monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.tar.gz monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.tar.xz monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.zip | |
Merge pull request #1 from erciccione/fix
Fix conflicts and rebase.
Diffstat (limited to 'MainApp.cpp')
0 files changed, 0 insertions, 0 deletions