commit 7ce8e72ca388e58f1437a38758170654913430ed
Merge: 632418d 50a4099
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Feb 2 15:21:00 2014 -0600
Merge branch 'master' into f20
.gitignore | 13 ++++++-------
smokeqt.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 9 deletions(-)
---