← Back to branch summary

~neon/qt/qtmultimedia

Viewing all changes in revision 899.

  • Committer: Frederik Gladhorn
  • Date: 2015-03-03 17:18:12 UTC
  • mfrom: (855.1.77)
  • Revision ID: git-v1:b348c9e7b0896f4eda4453c53bfffd5219489cbb
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
        src/gsttools/qgstutils.cpp

Change-Id: Ic54ab6c6560ded0db4b98f83256d997bee828083

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: