commit 4ddebb9f19eb4bb4b2dd9e7faddcd33a8aed18ef
Merge: 5281d0f 3cdaa06
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 22:47:11 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
kdeartwork.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---