Merge remote-tracking branch 'origin/Plasma/5.2'
Conflicts:
kcms/baloo/kcm_baloofile.desktop
kcms/useraccount/kcm_useraccount.desktop
Description
Description
Details
Details
- Committed
shumski Jan 17 2015, 7:56 PM - Parents
- R120:887392c991a0: Add missing QObject includes
R120:6ad4af486c66: Merge branch 'Plasma/5.2' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 887392c991a0 | shumski | Add missing QObject includes | Jan 17 2015 |