commit 4f6a8c37359e7b42f969b81b970f2e808feb76f3 Merge: a1ce7a9 2b77007 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 10:25:00 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ kwordquiz.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) ---