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-02-13 16:14:24 +01:00
2013-07-12 15:04:15 +02:00
2013-02-13 16:14:24 +01:00
2013-04-03 14:37:45 +02:00
2013-04-03 14:37:45 +02:00
2013-07-25 15:48:55 +02:00
2013-08-21 14:39:18 +02:00
2013-07-17 11:11:25 +02:00
2013-03-27 16:10:01 +01:00