commit 489678903a2e3d6c86a62fca819666141fdbc3dc Merge: 18fd92b 7d5ccee Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 09:12:54 2013 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kcolorchooser.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) ---