← Back to branch summary

~neon/phonon/vlc

Viewing all changes in revision 653.

  • Committer: Harald Sitter
  • Date: 2019-07-19 11:40:48 UTC
  • mfrom: (642.1.15)
  • Revision ID: git-v1:e8a2f9678ac90775dd7614f3e8934a06980e197e
Merge branch '0.10'

# Conflicts:
#       src/vlc.desktop.cmake

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: