Viewing all changes in revision 2588.7.8.
- Committer: Simon Hanna
- Date: 2016-05-17 08:48:19 UTC
- mfrom: (2625.1.36 openlp)
- mto: (2625.1.37 openlp)
- mto: This revision was merged to the branch mainline in revision 2649.
- Revision ID: simon.hanna@serve-me.info-20160517084819-lgup78nzyzjympuu
merge trunk
- files added:
- openlp/core/common/actions.py
- openlp/core/ui/lib
- openlp/plugins/remotes/html/assets
- openlp/plugins/remotes/html/css
- openlp/plugins/remotes/html/js
- tests/functional/openlp_core_ui_lib
- tests/interfaces/openlp_core_ui_lib
- tests/interfaces/openlp_core_ul_media_vendor
- tests/resources/media
- tests/resources/opsprosongs
- files removed:
- openlp/core/common/historycombobox.py
- openlp/core/utils
- tests/functional/openlp_core_utils
- tests/interfaces/openlp_core_utils
- files modified:
- .bzrignore
expand all
collapse all
added
removed
resources/images/general_preview.png
resources/images/ios_app_qr.png
resources/images/media_repeat.png
resources/images/song_search_ccli.png
resources/images/song_search_copy.png
resources/images/song_search_topic.png
