suutari-olli 728ffd7205 Merge to trunk on 8.4.16 ... You will need to manually delete the __pycache__ directory inside openlp_core_utils. run "bzr resolve openlp_core_utils" then you will be allowed to commit the changes. also resolved conflict for advancedtab.py		2016-04-08 16:46:45 +03:00
..
openlp_core	fix tests	2016-03-31 17:24:44 +01:00
openlp_core_common	pep8	2016-04-05 21:14:50 +01:00
openlp_core_lib	fix tests	2016-04-05 20:58:40 +01:00
openlp_core_ui	Merge to trunk on 8.4.16	2016-04-08 16:46:45 +03:00
openlp_core_ui_media	Year older	2015-12-31 22:46:06 +00:00
openlp_plugins	fix import issues	2016-04-04 22:19:37 +01:00
__init__.py	Year older	2015-12-31 22:46:06 +00:00
test_init.py	Year older	2015-12-31 22:46:06 +00:00