Tomas Groth 180c16147f Merge with trunk to resolve conflict.		2013-08-06 17:33:05 +01:00
..
hook-openlp.core.ui.media.py	changed to 120 chars	2013-07-18 21:28:35 +02:00
hook-openlp.plugins.presentations.presentationplugin.py	Merge with trunk to resolve conflict.	2013-08-06 17:33:05 +01:00
hook-openlp.py	changed to 120 chars	2013-07-18 21:28:35 +02:00