OpenLP

Merge lp:~alisonken1/openlp/pjlink2-j into lp:openlp

  1. pjlink2-j
  2. Merge into trunk
Proposed by Ken Roberts
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2765
Merged at revision: 2766
Proposed branch: lp:~alisonken1/openlp/pjlink2-j
Merge into: lp:openlp
Diff against target: 29 lines (+1/-4)
1 file modified
.bzrignore (+1/-4)
To merge this branch: bzr merge lp:~alisonken1/openlp/pjlink2-j
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+330472@code.launchpad.net

Commit message

Add PJLink notes - updated bzrignore for eric IDE

Description of the change

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/

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2016-08-13 14:29:12 +0000
3+++ .bzrignore 2017-09-09 07:08:46 +0000
4@@ -1,11 +1,9 @@
5 *.pyc
6 *.*~
7 \#*\#
8-*.eric4project
9-*.eric5project
10+*eric[1-9]project
11 *.ropeproject
12 *.e4*
13-.eric4project
14 .komodotools
15 *.komodoproject
16 list
17@@ -17,7 +15,6 @@
18 OpenLP.egg-info
19 build
20 resources/innosetup/Output
21-_eric4project
22 .pylint.d
23 *.qm
24 openlp/core/resources.py.old
25
26=== added file 'documentation/PJLink_Notes.odt'
27Binary 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
28=== added file 'documentation/PJLink_Notes.pdf'
29Binary 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