Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
This commit is contained in:
Eike Ziller
2013-06-25 10:14:14 +02:00
376 changed files with 3762 additions and 2070 deletions

View File

@@ -76,7 +76,8 @@ enum { debugLeaks = 0 };
\class ExtensionSystem::PluginManager
\mainclass
\brief Core plugin system that manages the plugins, their life cycle and their registered objects.
\brief The PluginManager class implements the core plugin system that
manages the plugins, their life cycle, and their registered objects.
The plugin manager is used for the following tasks:
\list