Merge branch 'master' into gsoc18-iconview-sort
Description
Description
Details
Details
- Committed
mqualmann Jun 20 2018, 5:40 PM - Parents
- R482:90f99fa95ce7: fix merge conflict in NEWS
R482:d6a48817dc4b: Merge branch 'master' into gsoc18-iconview-sort - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 90f99fa95ce7 | mqualmann | fix merge conflict in NEWS | Jun 20 2018 |