Raoul Snyman fce0830e56 Resolved conflicts ... bzr-revno: 181		2008-12-05 18:02:27 +00:00
..
openlp.org 2.0.e4q	Resolved conflicts	2008-12-05 18:02:27 +00:00
openlp.org 2.0.e4s	Added new Eric4 project files, updated root directory ignore property.	2008-11-21 18:58:03 +00:00
openlp.org 2.0.e4t	Changed erroneous "SimpleConfigParser" to "SafeConfigParser"	2008-12-05 07:23:32 +00:00