commit 203cd92b31fbba40661fc03288478695b8c90635
Merge: c885613 b253698
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Sat Apr 30 15:24:20 2011 -0500
Merge remote-tracking branch 'origin/master' into f15/master
Conflicts:
kdebase-workspace.spec
.gitignore | 2 +-
...kspace-4.6.1-ksysguard-add-missing-module.patch | 11 --------
kdebase-workspace-4.6.2-nvbacklight.patch | 26 --------------------
kdebase-workspace.spec | 21 +++++++---------
sources | 2 +-
5 files changed, 11 insertions(+), 51 deletions(-)
---