Merge branch '1.1' of gitorious.org:kdevelop/kdevplatform into 1.1
authorAleix Pol <aleixpol@kde.org>
Mon, 20 Sep 2010 11:28:28 +0000 (13:28 +0200)
committerAleix Pol <aleixpol@kde.org>
Mon, 20 Sep 2010 11:28:28 +0000 (13:28 +0200)
commitccfd0240952adafd310fd4efd9d27d58677f590c
treeb1b7017ac75bbf1bf7c33e065c15fd1ce3041e1d
parent39ff0aedae5f16556d382afe5e385c3a12c061c0
parent172ea94d44b3e2fa383f96c34401d92c510c6e7f
Merge branch '1.1' of gitorious.org:kdevelop/kdevplatform into 1.1