Merge branch '1.1'
authorMilian Wolff <mail@milianw.de>
Sat, 20 Nov 2010 16:39:01 +0000 (17:39 +0100)
committerMilian Wolff <mail@milianw.de>
Sat, 20 Nov 2010 16:39:01 +0000 (17:39 +0100)
commit637f3a2eece7830b5e729d256cd910f23919ff94
treec368544a458003eacb5dbbebc2c1d2a5c96fdb28
parent95cc3bb2a752c5163c7af0aefb6ead493c03568a
parentbb3ea0f0312d7e37b1632efc671270f80d3463a0
Merge branch '1.1'

Conflicts:
language/duchain/dumpchain.cpp
language/duchain/dumpchain.cpp
plugins/codeutils/codeutilsplugin.cpp
plugins/filemanager/filemanager.cpp