Eike Ziller
49db3a450a
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/cppeditor/cppeditor.cpp
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
src/plugins/texteditor/basetexteditor.cpp
Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
2014-09-03 16:08:02 +02:00
..
2012-01-13 10:09:40 +01:00
2014-07-09 09:33:29 +02:00
2014-05-27 07:17:56 +02:00
2014-03-20 12:32:48 +01:00
2014-08-28 09:38:10 +02:00
2009-02-24 12:29:26 +01:00
2012-10-05 11:49:06 +02:00
2014-01-21 10:18:04 +01:00
2014-09-02 15:11:24 +02:00
2011-08-29 13:13:52 +02:00
2013-10-09 11:22:48 +02:00
2014-01-21 10:17:52 +01:00
2014-05-16 14:27:13 +02:00
2014-01-08 08:29:47 +01:00
2014-01-20 11:49:30 +01:00
2014-03-25 17:04:17 +01:00
2012-07-26 23:05:48 +02:00
2014-01-08 08:29:47 +01:00