commit c829d0f35b767baeb6e2645fd542502668692215 Merge: 68175ee 1a57bf3 Author: Rex Dieter <rdieter at math.unl.edu> Date: Wed Mar 6 13:06:26 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ smokeqt.spec | 27 ++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 26 insertions(+), 10 deletions(-) ---