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

[Dan Horák]

commit e62b0c4b09082fe554176c619783be1a46da8b48
Merge: 8243130 e74c3e8
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 13 11:20:45 2010 +0200

    Merge branch 'master' into f12

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