SVN commit 11873 by rakuco:

Merge ^/branches/qt-5.5 into the top-level trunk/area51.

I should have integrated the qt-5.5 branch into this directory instead of
trunk/area51/QT, but I am not sure if manually editing svn:mergeinfo on the
latter is a good idea.

For now, record the merge in the top-level directory and also as a side-effect
bring in r11463 which was only committed to branches/qt-5.5:

------------------------------------------------------------------------
r11463 | tcberner | 2015-10-03 10:16:56 +0200 (Sat, 03 Oct 2015) | 3 lines

Sync gstreamer-1.6 build fixes with ports r398140 and r398140.
------------------------------------------------------------------------



 _M            . (directory)  
 A             PORTS/multimedia/qt5-phonon4-gstreamer/files (directory)  


_______________________________________________
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Reply via email to