feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/toolchainmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
This commit is contained in:
Oswald Buddenhagen
2015-12-02 18:42:05 +01:00
parent f86ebcbf22 e4be9edc4d
commit 100ea30a1a
185 changed files with 2327 additions and 7907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangtextmark.cpp
View File

@@ -30,7 +30,7 @@
#include "clangtextmark.h"
#include "constants.h"
#include "clangconstants.h"
#include <coreplugin/coreicons.h>