OpenLP

Merge lp:~trb143/openlp/plugins into lp:openlp

  1. plugins
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/plugins
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/plugins
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+12243@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Minor cleanup

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

This has to be THE most AWESOME commit EVAR! :-P

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/lib/__init__.py'
2--- openlp/core/lib/__init__.py 2009-09-19 11:25:01 +0000
3+++ openlp/core/lib/__init__.py 2009-09-21 18:59:35 +0000
4@@ -111,8 +111,7 @@
5 from eventreceiver import Receiver
6 from settingsmanager import SettingsManager
7 from pluginconfig import PluginConfig
8-from plugin import PluginStatus
9-from plugin import Plugin
10+from plugin import PluginStatus, Plugin
11 from pluginmanager import PluginManager
12 from settingstab import SettingsTab
13 from mediamanageritem import MediaManagerItem