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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Change-Id: I79fac4a4e8535153da1b3f73a6b1caad1513ea9c
This commit is contained in:
Eike Ziller
2015-02-16 12:35:44 +01:00
parent bb0dc34c50 b3d9c5e5e9
commit 45e544b442
88 changed files with 95 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/texteditor.cpp
View File

@@ -50,6 +50,8 @@
#include "texteditoroverlay.h"
#include "texteditorsettings.h"
#include "typingsettings.h"
#include "extraencodingsettings.h"
#include "storagesettings.h"
#include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/codeassistant.h>