Merge branch '1.1'

Authored by mwolff on Nov 20 2010, 4:39 PM.

Description

Merge branch '1.1'

Conflicts:
language/duchain/dumpchain.cpp

Merged Changes

CommitAuthorDetailsCommitted
bb3ea0f0312dben2367
Merge branch '1.1' of git://gitorious.org/kdevelop/kdevplatform into 1.1 
Nov 17 2010
96e29f7bf73fben2367
Correct FileManager contextMenu 
Nov 17 2010
dd4644f246danalvarez
Add i18n comments to strings in codeutils plugin. 
Nov 17 2010
227a3561d778nalvarez
DumpChain: code cleanup. 
Nov 17 2010