commit 3bef8af96e0525a7eb12682eac3160f888d6b5f0 Merge: c6c9528 7470330 Author: Rex Dieter <rdieter at math.unl.edu> Date: Wed Mar 6 16:33:37 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ ruby-qt.spec | 25 ++++++++++++++++++++----- sources | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) ---