Tomas Groth 180c16147f Merge with trunk to resolve conflict.		2013-08-06 17:33:05 +01:00
..
forms	Implemented adding images into groups	2013-01-25 15:09:22 +01:00
i18n
images
pyinstaller	Merge with trunk to resolve conflict.	2013-08-06 17:33:05 +01:00
__init__.py
openlp.desktop
openlp.xml