Merge branch 'master' of gitorious.org:kdevelop/kdevelop
authorDavid nolden <david.nolden.kde@art-master.de>
Sat, 13 Nov 2010 16:49:35 +0000 (17:49 +0100)
committerDavid nolden <david.nolden.kde@art-master.de>
Sat, 13 Nov 2010 16:49:35 +0000 (17:49 +0100)
commit5bba0148dd1b383dcb4769d515cd392a103ff59f
tree37b6e81787a8e0e7e87c780c3c47e8a5d46baed7
parentc90d3099cf37196abe90954d3abb42d157895aad
parent4454dd5d61d6c8e5bba315fdc071e1a9a7813493
Merge branch 'master' of gitorious.org:kdevelop/kdevelop

Conflicts:
languages/cpp/parser/commentformatter.cpp
languages/cpp/parser/tests/test_parser.cpp
languages/cpp/parser/commentformatter.cpp
languages/cpp/parser/tests/test_parser.cpp