Oswald Buddenhagen
c2e90c360b
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/cpptools/cpptoolsplugin.h
src/plugins/projectexplorer/customtoolchain.cpp
src/plugins/vcsbase/command.cpp
Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
2013-08-21 14:39:18 +02:00
..
2013-08-21 14:39:18 +02:00
2013-08-19 14:43:58 +02:00
2013-08-13 14:13:33 +02:00
2013-08-20 14:18:45 +02:00
2013-08-19 12:45:43 +02:00
2008-12-02 12:01:29 +01:00
2013-08-21 14:39:18 +02:00
2013-07-17 11:11:25 +02:00
2013-04-02 17:38:49 +02:00