openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

Ken Roberts has proposed merging lp:~alisonken1/openlp/pjlink2-j into lp:openlp.

Commit message:
Add PJLink notes - updated bzrignore for eric IDE

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/pjlink2-j/+merge/330472

No code changes.

- Added PJLink programming notes as openlp/documentation/PJlink_Notes.odt and PJlink_Notes.pdf
- Update .bzrignore for eric IDE multiple versions

--------------------------------
lp:~alisonken1/openlp/pjlink2-j (revision 2765)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2186/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2089/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1976/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1346/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1182/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/312/
[FAILURE] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/154/

-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/pjlink2-j into lp:openlp.

=== modified file '.bzrignore'
--- .bzrignore	2016-08-13 14:29:12 +0000
+++ .bzrignore	2017-09-09 07:08:46 +0000
@@ -1,11 +1,9 @@
 *.pyc
 *.*~
 \#*\#
-*.eric4project
-*.eric5project
+*eric[1-9]project
 *.ropeproject
 *.e4*
-.eric4project
 .komodotools
 *.komodoproject
 list
@@ -17,7 +15,6 @@
 OpenLP.egg-info
 build
 resources/innosetup/Output
-_eric4project
 .pylint.d
 *.qm
 openlp/core/resources.py.old

=== added file 'documentation/PJLink_Notes.odt'
Binary files documentation/PJLink_Notes.odt	1970-01-01 00:00:00 +0000 and documentation/PJLink_Notes.odt	2017-09-09 07:08:46 +0000 differ
=== added file 'documentation/PJLink_Notes.pdf'
Binary files documentation/PJLink_Notes.pdf	1970-01-01 00:00:00 +0000 and documentation/PJLink_Notes.pdf	2017-09-09 07:08:46 +0000 differ