Merge remote-tracking branch 'origin/KDE/4.10' into master
Conflicts:
kwin/scripting/scripting.cpp
powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop
solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop
Description
Description
Details
Details
- Committed
oliverhenshaw May 28 2013, 4:36 PM - Parents
- R108:4475d8079d85: add qml import paths in correct order
R108:7fa62bfa51c3: kwin: Use the new map() interface in renderQuads() - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 4475d8079d85 | oliverhenshaw | add qml import paths in correct order | May 28 2013 | |||
| 635d7da00541 | oliverhenshaw | Replace foreach with java-style iterator | May 28 2013 | |||
| 12cca1499288 | oliverhenshaw | Drop unneeded duplicate addImportPath | May 28 2013 | |||
| eff79fd1f5e2 | l10n daemon script | SVN_SILENT made messages (.desktop file) | May 24 2013 | |||
| 9fe88895ccb3 | l10n daemon script | SVN_SILENT made messages (.desktop file) | May 21 2013 |