commit 2e0494c61dcfdd6148381559459b38b6e87a6c5d
Merge: e14e5d3 41b3338
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 22:37:00 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
dragon.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---