← Back to branch summary

~neon/phonon/vlc

Viewing all changes in revision 650.

  • Committer: Harald Sitter
  • Date: 2019-07-05 14:47:38 UTC
  • mfrom: (642.1.11)
  • Revision ID: git-v1:b301d2c881a3d1d969edcdc0ea7c8aec439f5eb6
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: