[MPlayer-cvslog] r24798 - in trunk: libmpcodecs/ve_vfw.c loader/win32.c loader/wine/objbase.h

[Compn]

On Wed, 17 Oct 2007 16:46:28 +0200, Diego Biurrun wrote:

>On Wed, Oct 17, 2007 at 09:24:12AM -0400, Compn wrote:
>> On Wed, 17 Oct 2007 15:06:40 +0200, Diego Biurrun wrote:
>> 
>> >On Wed, Oct 17, 2007 at 07:14:21AM +0200, compn wrote:
>> >> 
>> >> Log:
>> >> vfw fixes
>> >> patch by Gianluigi Tiesi mplayer___netfarm.it
>> >> http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2007-September/054136.html
>> >
>> >You have merged two separate patches into one.  This is
>> >unacceptable, revert this commit.
>> 
>> using svn copy or svn merge ?
>> svn-howto is confusing me atm :)
>
>I don't care.  Since you will recommit it won't make a real difference.


this normal?

C:\mplayer\libmpcodecs>rm ve_vfw.c
rm: ve_vfw.c: No such file or directory

C:\mplayer\libmpcodecs>svn cp -r 22817
svn://svn.mplayerhq.hu/mplayer/trunk/libm pcodecs/ve_vfw.c ve_vfw.c
svn: Entry for 've_vfw.c' exists (though the working file is missing)

C:\mplayer\libmpcodecs>svn diff ve_vfw.c

-compn