commit 4cf3ebb691b4e1acc04ec278a4f7932fac078a6d Merge: 0af60db e94162f Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 10:13:39 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ kolourpaint.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) ---