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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/projectexplorer/compileoutputwindow.cpp
	src/plugins/projectexplorer/compileoutputwindow.h
	src/plugins/projectexplorer/outputwindow.cpp
	src/plugins/projectexplorer/outputwindow.h
This commit is contained in:
con
2010-07-16 11:50:01 +02:00
parent 41236d29d3 2b3db20507
commit eef08b12e3
8 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/taskwindow.h
View File

@@ -78,6 +78,7 @@ public:
signals:
void tasksChanged();
void tasksCleared();
private slots:
void addCategory(const QString &categoryId, const QString &displayName);