commit 0f6c860d27a1023ce3e6a304eda8e1a95c1bdf0c
Merge: 86dcf5c d6078dd
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Jul 1 09:12:05 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
konquest.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---