~suutari-olli/openlp/escape-fixes-1294111-1497637

« back to all changes in this revision

Viewing changes to openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h

  • Committer: suutari-olli
  • Date: 2016-01-07 02:53:59 UTC
  • mfrom: (2557.2.31 openlp)
  • Revision ID: suutari.olli@gmail.com-20160107025359-q2feybbwxaoihqxr
Merge to trunk on 1/7/2015.

I noticed this branch also seems to be fixing this bug:
https://bugs.launchpad.net/openlp/+bug/1531691

However, escape item still remains buggy with problems related to resuming
video and presentations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/******************************************************************************
2
2
* OpenLP - Open Source Lyrics Projection                                      *
3
3
* --------------------------------------------------------------------------- *
4
 
* Copyright (c) 2008-2015 OpenLP Developers                                   *
 
4
* Copyright (c) 2008-2016 OpenLP Developers                                   *
5
5
* --------------------------------------------------------------------------- *
6
6
* This program is free software; you can redistribute it and/or modify it     *
7
7
* under the terms of the GNU General Public License as published by the Free  *