Merge branch '1.1'
authorMilian Wolff <mail@milianw.de>
Thu, 28 Oct 2010 17:26:40 +0000 (19:26 +0200)
committerMilian Wolff <mail@milianw.de>
Thu, 28 Oct 2010 17:26:40 +0000 (19:26 +0200)
commit9adecc7c271aa43772c29ecdbbe36639cc354323
tree78bd85d0fc0ebc7b65562251f01e2a4ec879ca41
parentc7a599bbc0f42d7058b39c09d8f877886c895d9c
parent701730ac118bdf61d80a6cc12c233aefc7c37127
Merge branch '1.1'

Conflicts:
CMakeLists.txt
app_templates/simple_phpapp/simple_phpapp.kdevtemplate
phplanguagesupport.cpp
app_templates/simple_phpapp/simple_phpapp.kdevtemplate
kdevphpsupport.desktop