[kdeutils/f16: 12/12] Merge remote-tracking branch 'origin/f17' into f16
Rex Dieter
rdieter at fedoraproject.org
Thu Mar 8 05:54:55 UTC 2012
commit 07e6af72614abbe30e250ce0b41806f8f84f8702
Merge: f6367ec 05b0491
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Mar 7 23:56:18 2012 -0600
Merge remote-tracking branch 'origin/f17' into f16
Conflicts:
.gitignore
kdeutils.spec
sources
.gitignore | 2 -
....4.1-printer-applet-InstallPrinterDrivers.patch | 102 ----
kdeutils-4.7.1-gpg2.patch | 37 --
kdeutils-4.7.1-job-originating-user-name.patch | 12 -
kdeutils.spec | 550 ++------------------
sources | 1 -
6 files changed, 45 insertions(+), 659 deletions(-)
---
More information about the scm-commits
mailing list