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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
This commit is contained in:
mae
2009-01-21 15:24:20 +01:00
parent 3b04ed3184 f73861d458
commit 7cfa4dbe5b
67 changed files with 510 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/perforce/perforceplugin.cpp
View File

@@ -58,7 +58,7 @@
#include <vcsbase/basevcssubmiteditorfactory.h>
#include <vcsbase/vcsbaseeditor.h>
#include <QtCore/qplugin.h>
#include <QtCore/QtPlugin>
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>