commit b1fff38ffb924ebe2973b34845ffa97aa25f690f
Merge: dde2bb2 7adb6d8
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 22:42:32 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
kblackbox.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---