~suutari-olli/openlp/click-slide-to-go-live-from-blank

Viewing all changes in revision 2664.

  • Committer: Olli Suutari
  • Date: 2016-08-10 18:50:40 UTC
  • mfrom: (2625.1.63 openlp)
  • Revision ID: suutari.olli@gmail.com-20160810185040-x0ftuvh4n0ishf0u
- Merged trunk and resolved conflict that was created by ui-messages-part-1 branch.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: