commit 68ef07d7b6713c1a70f7a2765d84ab32e035f1b4
Merge: 6bd4112 e33217b
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 23:20:02 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
kwordquiz.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---