diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-01-19 15:41:29 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2018-01-19 15:41:29 +0300 |
| commit | 5a97ddde5a0f14f715c32841c7f4f884aa99199c (patch) | |
| tree | 64f15922d0c834097ecdf0cac9fb4dcf4e9d7ad3 /test | |
| parent | b8539eb32918109388bf70389ffea51c4d8f8822 (diff) | |
| parent | 6f5b3eb4d7028c08718756a3dff89016c1511c28 (diff) | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
src/gui/updater/updater.cpp
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions