commit c551d0430600b75c9e5e873bc7df04cc6b63bde2 Merge: 9f48a7a 19866d1 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Sep 16 09:13:21 2014 -0500 Merge branch 'f21' into f20 .gitignore | 3 +++ smokegen.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) ---