Merge branch '1.1' of git://gitorious.org/kdevelop/kdevplatform into 1.1
authorben2367 <port.benjamin@gmail.com>
Wed, 17 Nov 2010 13:41:00 +0000 (14:41 +0100)
committerben2367 <port.benjamin@gmail.com>
Wed, 17 Nov 2010 13:41:00 +0000 (14:41 +0100)
commitbb3ea0f0312d7e37b1632efc671270f80d3463a0
tree323d97bd7458302174b989130330b55d30664d9c
parent96e29f7bf73f6e622dbbab86d079ac076ca18eb0
parentdd4644f246da0f5469df5a85fc52deca6ce284df
Merge branch '1.1' of git://gitorious.org/kdevelop/kdevplatform into 1.1