[qlandkartegt/f13/master: 2/2] Merge branch 'master' into f13

[Dan Horák]

commit 68f86430b6f78cd35f6614df12db70ee0a11eef1
Merge: 87d691e e74c3e8
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 13 11:20:08 2010 +0200

    Merge branch 'master' into f13

 .gitignore                     |    5 +++--
 qlandkartegt-0.19.1-zlib.patch |    9 +++++++++
 qlandkartegt.spec              |    8 +++++++-
 sources                        |    2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)
---