lp:~tomasgroth/openlp/vlc-win-fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.2 at revision 2565

Raoul Snyman: Approve on 2015-10-24

Diff: 11 lines (+1/-0)

1 file modified

openlp/core/ui/media/vendor/vlc.py (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1507385: VLC not available after upgrade to 2.2

High

Fix Released

Link a bug report

Related blueprints

2563. By Tomas Groth on 2015-10-23

Implement a workaround for a PyInstaller 3.0 bug to load vlc.

2562. By Tim Bentley on 2015-10-17

Release 2.2

2561. By Tim Bentley on 2015-10-16

Fixed translations by removing ../../

Last set of translations before 2.2 this weekend.

2560. By Tomas Groth on 2015-10-15

Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.

2559. By Raoul Snyman on 2015-10-14

"Let's download things once only, instead of 3 times."

2558. By Tomas Groth on 2015-10-13

Make 2 texts translatable.
Remove unneeded quotes from commit message in the merge-script.

2557. By Tomas Groth on 2015-10-11

"Added merge-helper-script
Some Pep8 fixes"

2556. By Tomas Groth on 2015-10-03

"Fix string that makes it possible to translate the string.
Updated QR code pointing to android app.
Update link to google play store.
"

2555. By Tim Bentley on 2015-09-10

Fix code so will actually start and long line lenght which broken standards

2554. By Jonathan Springer on 2015-09-10

Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized
Change relative import in bible db to absolute import
Docstring cleanups