CVS commit: wip/vlc

[Adam Hoka <hoka_adam%users.sourceforge.net@localhost>]

Module name:    wip
Committed by:   hoka_adam
Date:           Mon Jan  7 10:41:14 UTC 2008

Modified Files:
        wip/vlc: DESCR Makefile PLIST buildlink3.mk distinfo
        wip/vlc/patches: patch-aa patch-ab

Log Message:
Resolving conflicts.


To generate a diff of this commit:
cvs -z3 rdiff -u -r1.10 -r1.11 wip/vlc/Makefile
cvs -z3 rdiff -u -r1.3 -r1.4 wip/vlc/buildlink3.mk wip/vlc/patches/patch-aa \
    wip/vlc/patches/patch-ab
cvs -z3 rdiff -u -r1.4 -r1.5 wip/vlc/DESCR wip/vlc/PLIST
cvs -z3 rdiff -u -r1.5 -r1.6 wip/vlc/distinfo

To view a diff of this commit:
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/vlc/Makefile?r1=1.10&r2=1.11
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/vlc/buildlink3.mk?r1=1.3&r2=1.4
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/vlc/patches/patch-aa?r1=1.3&r2=1.4
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/vlc/patches/patch-ab?r1=1.3&r2=1.4
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/vlc/DESCR?r1=1.4&r2=1.5
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/vlc/PLIST?r1=1.4&r2=1.5
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/vlc/distinfo?r1=1.5&r2=1.6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
pkgsrc-wip-cvs mailing list
pkgsrc-wip-cvs%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-cvs