[kdelibs/f19: 17/17] Merge branch 'master' into f19
Rex Dieter
rdieter at fedoraproject.org
Thu Sep 5 02:57:25 UTC 2013
commit f6cb502cd2a031dd344830acf19b43ddd1d9551b
Merge: d2c6e9b 865e874
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Sep 4 21:56:55 2013 -0500
Merge branch 'master' into f19
Conflicts:
.gitignore
kdelibs.spec
sources
.gitignore | 2 +-
Fix-the-synchronous-mode-wallet-open-logic.patch | 86 ++++++++++++++++++++
SOLID_HAL_LEGACY.sh | 6 ++
kdelibs.spec | 64 ++++++++++++---
sources | 2 +-
...packagekit-support-feature-off-by-default.patch | 35 ++++++++
6 files changed, 181 insertions(+), 14 deletions(-)
---
More information about the scm-commits
mailing list