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/perforce/perforceplugin.cpp
This commit is contained in:
mae
2009-01-20 17:10:34 +01:00
parent ed5afa14dd a654dc0b3a
commit 145f9c24ba
252 changed files with 3267 additions and 3035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
View File

@@ -35,7 +35,6 @@
#include "qworkbench_wrapper.h"
#include "metatypedeclarations.h"
#include <extensionsystem/ExtensionSystemInterfaces>
#include <utils/qtcassert.h>
#include <interface_wrap_helpers.h>
#include <wrap_helpers.h>