Merge branch 'KDE/4.8' into KDE/4.9

Browse Source

Merged via `git merge --log --edit --no-ff --stat -s
recursive'. According to the diffstat, the only actual changes came
from the solid-hal commit below, as expected.

* KDE/4.8:
  HAL: Use the filtering code in HalDevice in devicesFromQuery().
  Fix mem leak (cherry picked from commit b70d6c3d5a021bc37b962c01fc57b6717e9f2868)
  Fix mem leak. Found during debug kmail (cherry picked from commit 0fddae9da44c7edb2140aeb95b4471e2521b1735)
  Allow derived classes to return invalid index in mapToSource.
  SVN_SILENT made messages (.desktop file)

...

This commit is contained in:

Raphael Kubo da Costa 2012-07-23 22:34:13 -03:00

parent 52fbecaf2c d3e78d9b8f

commit c0d3b534e2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available