CVS commit: wip/wine

[Aleksej Saushev <asau%users.sourceforge.net@localhost>]

Module name:    wip
Committed by:   asau
Date:           Fri Jul 18 06:50:43 UTC 2008

Modified Files:
        wip/wine: DESCR Makefile PLIST.FreeBSD PLIST.Linux PLIST.common
            buildlink3.mk distinfo options.mk
        wip/wine/patches: patch-aa patch-ab patch-ac patch-ad patch-ae
            patch-af patch-ag patch-ai patch-aj patch-ak

Log Message:
Resolve conflicts.

To generate a diff of this commit:
cvs -z3 rdiff -u -r1.14 -r1.15 wip/wine/Makefile
cvs -z3 rdiff -u -r1.2 -r1.3 wip/wine/DESCR wip/wine/PLIST.FreeBSD \
    wip/wine/PLIST.Linux wip/wine/buildlink3.mk wip/wine/patches/patch-ab \
    wip/wine/patches/patch-ac wip/wine/patches/patch-ad \
    wip/wine/patches/patch-ae wip/wine/patches/patch-ag \
    wip/wine/patches/patch-ai wip/wine/patches/patch-aj \
    wip/wine/patches/patch-ak
cvs -z3 rdiff -u -r1.3 -r1.4 wip/wine/PLIST.common wip/wine/patches/patch-aa \
    wip/wine/patches/patch-af
cvs -z3 rdiff -u -r1.4 -r1.5 wip/wine/options.mk
cvs -z3 rdiff -u -r1.9 -r1.10 wip/wine/distinfo

To view a diff of this commit:
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/Makefile?r1=1.14&r2=1.15
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/DESCR?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/PLIST.FreeBSD?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/PLIST.Linux?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/buildlink3.mk?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-ab?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-ac?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-ad?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-ae?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-ag?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-ai?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-aj?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-ak?r1=1.2&r2=1.3
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/PLIST.common?r1=1.3&r2=1.4
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-aa?r1=1.3&r2=1.4
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/patches/patch-af?r1=1.3&r2=1.4
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/options.mk?r1=1.4&r2=1.5
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/wine/distinfo?r1=1.9&r2=1.10

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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
pkgsrc-wip-cvs mailing list
pkgsrc-wip-cvs%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-cvs