diff options
| author | Luca Beltrame <[email protected]> | 2018-01-18 09:09:49 +0100 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2018-01-18 09:09:49 +0100 |
| commit | 1a6b3c0a2baba955259d6083c0a3f25dfb44a682 (patch) | |
| tree | c2a1dae6bb4a2a55cbb50206498951140e252318 /src/views | |
| parent | dedb612764cfa747ff3ff339323c15cd1fea6925 (diff) | |
| parent | 64d2fd29819fa46c293e8c726c7df2ff00b332b3 (diff) | |
Merge remote-tracking branch 'origin/Applications/17.12'
Conflicts:
CMakeLists.txt [versions]
src/panels/places/placesitemmodel.cpp
Diffstat (limited to 'src/views')
0 files changed, 0 insertions, 0 deletions