commit cd9a7a314448e06a358e859feab2bb50dd853e0d
Merge: 8b9ea73 fcf2d15
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 16:54:06 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
libkdeedu.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---