[kdevelop/f13/master: 5/5] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/kdevelop into f13/master

[Kevin Kofler]

commit 9f0058c69319fa7c23c4f66c792debcc1d988e7a
Merge: 26e6837 7fca8eb
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Aug 12 03:01:02 2010 +0200

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/kdevelop into f13/master

 .gitignore                     |    1 +
 kdevelop-4.0.0-qmake_qt4.patch |   21 ---------------------
 kdevelop.spec                  |   21 +++++++++++----------
 sources                        |    3 +--
 4 files changed, 13 insertions(+), 33 deletions(-)
---