MFstable/10 r233422:
r233422 (by joel):
Remove superfluous paragraph macro.
Command used:
$ svn merge --accept mine-conflict -c 233422 ^/stable/10
Conflicts:
share/man/man4/netmap.4
share/man/man9/locking.9 (
Tags None Referenced Files None Subscribers None
Description MFstable/10 r233422: r233422 (by joel): Remove superfluous paragraph macro. Command used: Conflicts:
Details
Event Timeline |