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

@@ -42,7 +42,8 @@
/*!
\class ExtensionSystem::PluginView
\brief Widget that shows a list of all plugins and their state.
\brief The PluginView class implements a widget that shows a list of all
plugins and their state.
This can be embedded e.g. in a dialog in the application that
uses the plugin manager.