~suutari-olli/openlp/ui-messages-part-1-latest-commit

Viewing all changes in revision 2653.

  • Committer: suutari-olli
  • Date: 2016-07-24 20:20:25 UTC
  • mfrom: (2632.2.49 openlp)
  • Revision ID: suutari.olli@gmail.com-20160724202025-q5jr3o0phfdugqh8
- Merged trunk on 24.7.16
- Added superflys startup traceback fix to my code
- Resolved conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: