commit 79bdda940dece4fa63f2a38b99160298cdc97380
Merge: 1191bd2 259e0d7
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 23:07:55 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
kollision.spec | 23 ++++++++++++++++++++++-
sources | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
---