commit ce6e25ace95366ff8071d29748bf0ee754a1e439 Merge: f6046b0 4781940 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 10:18:46 2013 -0600 Merge branch 'f18' into f17 .gitignore | 6 +----- kstars.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) ---