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-23 14:41:33 +01:00
parent 9df3494278 6d679fd6d9
commit 1b345cfa0f
122 changed files with 1621 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitplugin.cpp
View File

@@ -236,8 +236,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *error_message)
m_gitClient = new GitClient(this);
// Create the globalcontext list to register actions accordingly
QList<int> globalcontext;
globalcontext << m_core->uniqueIDManager()->
uniqueIdentifier(Core::Constants::C_GLOBAL);
globalcontext << m_core->uniqueIDManager()->uniqueIdentifier(Core::Constants::C_GLOBAL);
// Create the output Window
m_outputWindow = new GitOutputWindow();