Andreas Preikschat f0be2ecc17 head + conflict		2013-10-11 11:48:35 +02:00
..
openlp_core_lib	head + conflict	2013-10-11 11:48:35 +02:00
openlp_core_ui	tests updates	2013-10-04 21:36:02 +01:00
openlp_core_utils	Merged mock changes	2013-10-04 16:14:04 -05:00
openlp_plugins	Missed removing one line when merging	2013-10-04 16:44:58 -05:00
__init__.py	Ooops.	2013-09-20 11:35:50 +02:00