Log Message: Resolving conflicts.
Revision | Action | file |
0 | modify | wip/vlc/DESCR |
0 | modify | wip/vlc/Makefile |
0 | modify | wip/vlc/PLIST |
0 | modify | wip/vlc/buildlink3.mk |
0 | modify | wip/vlc/distinfo |
0 | modify | wip/vlc/patches/patch-aa |
0 | modify | wip/vlc/patches/patch-ab |