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-07-23 15:19:17 +02:00
2013-07-15 12:42:18 +02:00
2013-08-21 11:01:42 +02:00
2013-07-11 16:59:07 +02:00
2013-05-29 09:16:25 +02:00
2013-07-04 15:42:50 +02:00
2013-07-11 09:16:20 +02:00
2013-07-19 16:02:15 +02:00
2013-06-21 18:01:25 +02:00
2013-06-07 15:33:55 +02:00
2013-08-13 09:23:34 +02:00
2013-06-17 15:27:45 +02:00