commit 99cadfcd4eb02e3fb34eae036a94a2689d6917c4 Merge: 5422101 3b02590 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 09:47:20 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ khangman.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) ---