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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/plugins/coreplugin/documentmanager.cpp

Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
This commit is contained in:
Eike Ziller
2013-06-14 16:21:04 +02:00
parent 5ee8650eb4 42c9c96361
commit afe1d5ee65
427 changed files with 8639 additions and 4226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@
#include <utils/qtcassert.h>
#include <QByteArray>
#include <QDataStream>
#include <QHash>
#include <QVariant>