SVN commit 11872 by rakuco:

Merge ^/trunk/area51@10759.

Start trying to fix all the svn:mergeinfo complications, as well as some other
issues caused by the fact that some commits were done independently in both
trunk and the plasma5 branch.

We should have done merged only to the root of the branch, so some SVN surgery
will be coming up in the future.

For now, make the root of the plasma5 branch in sync with trunk at r10759: it
expands the contiguous range of trunk/area51 commits that have been merged into
the branch and it precedes all commits done to trunk that cause merge problems.



 _M            . (directory)  
 M  +2 -2      PORTS/sysutils/polkit-qt5/Makefile  


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

Reply via email to