raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Resolved conflicts

Browse Source 
bzr-revno: 181
This commit is contained in:
Raoul Snyman 2008-12-05 18:02:27 +00:00
parent c471a84766
commit fce0830e56
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eric4project/openlp.org 2.0.e4q
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd"> <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
<!-- eric4 user project file for project openlp.org 2.0 --> <!-- eric4 user project file for project openlp.org 2.0 -->
<!-- Saved: 2008-12-03, 15:55:06 --> <!-- Saved: 2008-12-03, 23:36:03 -->
<!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org --> <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
<UserProject version="4.0"> <UserProject version="4.0">
</UserProject> </UserProject>

1
openlp.org 2.0.e4p
View File

@ -82,6 +82,7 @@
<Source>openlp/core/utils/winregistry.py</Source> <Source>openlp/core/utils/winregistry.py</Source>
<Source>openlp/core/utils/registry.py</Source> <Source>openlp/core/utils/registry.py</Source>
<Source>openlp/core/utils/linregistry.py</Source> <Source>openlp/core/utils/linregistry.py</Source>
<Source>setup.py</Source>
<Source>openlp/core/lib/pluginconfig.py</Source> <Source>openlp/core/lib/pluginconfig.py</Source>
</Sources> </Sources>
<Forms> <Forms>