Subject: CVS commit: wip/wine
From: Aleksej Saushev
Date: 2008-07-18 08:50:43
Message id: E1KJjnu-0001XT-1X@sc8-pr-cvs1.sourceforge.net
Log Message:
Resolve conflicts.
Files:
RevisionActionfile
1.3modifywip/wine/DESCR
1.15modifywip/wine/Makefile
1.3modifywip/wine/PLIST.FreeBSD
1.3modifywip/wine/PLIST.Linux
1.4modifywip/wine/PLIST.common
1.3modifywip/wine/buildlink3.mk
1.10modifywip/wine/distinfo
1.5modifywip/wine/options.mk
1.4modifywip/wine/patches/patch-aa
1.3modifywip/wine/patches/patch-ab
1.3modifywip/wine/patches/patch-ac
1.3modifywip/wine/patches/patch-ad
1.3modifywip/wine/patches/patch-ae
1.4modifywip/wine/patches/patch-af
1.3modifywip/wine/patches/patch-ag
1.3modifywip/wine/patches/patch-ai
1.3modifywip/wine/patches/patch-aj
1.3modifywip/wine/patches/patch-ak