commit d929ae16da8097c02b7cca775817a4d6a74b2f01
Merge: 2ceba9b cb0e8b0
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Feb 2 20:21:07 2014 -0600
Merge branch 'master' into f20
.gitignore | 16 ++++++----------
pykde4.spec | 25 +++++++++++++++++++++++--
sources | 2 +-
3 files changed, 30 insertions(+), 13 deletions(-)
---