Merge remote-tracking branch 'origin/2.6'
authorEike Ziller <eike.ziller@digia.com>
Mon, 22 Oct 2012 09:17:09 +0000 (11:17 +0200)
committerEike Ziller <eike.ziller@digia.com>
Mon, 22 Oct 2012 09:17:09 +0000 (11:17 +0200)
commit021b64b5dfb8776b847d0faffb0619d4d64be112
tree1d645c544fc1b960ee7f75b01666a64b4d10bfec
parent68a7861263cb137038a12d692a264647b404756b
parentfbf6a8da757d42b0d4b8126400f4c66dafc6bd95
Merge remote-tracking branch 'origin/2.6'
src/libs/cplusplus/LookupContext.cpp
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
src/plugins/cpptools/cpptoolsplugin.h
src/plugins/help/helpviewer_qwv.cpp
src/plugins/projectexplorer/kitmanager.cpp