Revision 659749
Go back to digest for 6th May 2007Other in KDE Base
Matthias Kretz committed changes in /trunk/KDE/kdelibs:
merge phonon-solid-sprint working branch - minus phonon and solid subdirs
File Changes
Added 10 files
- /trunk/KDE/kdelibs
- /includes/Solid/DeviceInterface
- /includes/Solid/DeviceNotifier
- /includes/Solid/GenericInterface
- /includes/Solid/Networking
- /includes/Solid/OpticalDrive
- /includes/Solid/PowerManagement
- /includes/Solid/StorageDrive
- /includes/Solid/StorageVolume
- /interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
- /interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.h
Deleted 12 files
- /trunk/KDE/kdelibs/includes/Solid
- /Capability
- /Cdrom
- /DeviceManager
- /FrontendObject
- /Ifaces
- /ManagerBase
- /Network
- /NetworkInterface
- /PowerManager
- /Storage
- /Volume
- /WirelessNetwork
Modified 12 files
- /trunk/KDE/kdelibs
- /includes/CMakeLists.txt
- /kfile/kfileplacesmodel.cpp
- /kfile/kfileplacesview.cpp
- /khtml/CMakeLists.txt
- /cmake/modules/FindKDE4Internal.cmake
- /kdecore/util/qtest_kde.h
- /khtml/ecma/kjs_audio.cpp
- /khtml/ecma/kjs_audio.h
- /kio/kfile/kdevicelistmodel.cpp
- /interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
- /interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
- /interfaces/kmediaplayer/kfileaudiopreview/mediacontrols_p.h
34 files changed in total