← Back to branch summary

~neon/phonon/gstreamer

Viewing all changes in revision 2648.

  • Committer: Harald Sitter
  • Date: 2019-07-11 16:21:45 UTC
  • mfrom: (2630.1.8)
  • Revision ID: git-v1:d3ed76d5f67b395732a1f8e340eccd32a80d6d33
Merge branch '4.9'

# Conflicts:
#       gstreamer/gstreamer.desktop.cmake

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: