[kde-printer-applet/f17: 8/8] Merge branch 'master' into f17
Rex Dieter
rdieter at fedoraproject.org
Sat Sep 8 17:16:29 UTC 2012
commit 15454ae1cdd66f320efe944075e0f0d1216984dd
Merge: a948578 49dc8b7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Sep 8 12:15:18 2012 -0500
Merge branch 'master' into f17
Conflicts:
.gitignore
kde-printer-applet.spec
sources
.gitignore | 1 +
kde-printer-applet.spec | 25 +++++++++++++++++++------
sources | 2 +-
3 files changed, 21 insertions(+), 7 deletions(-)
---
More information about the scm-commits
mailing list