[FFmpeg-cvslog] r17251 - trunk/libavcodec/xvmc.h

[Ivan Kalvachev]

On 2/14/09, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Sat, Feb 14, 2009 at 07:03:52PM +0100, Diego Biurrun wrote:
>> On Sat, Feb 14, 2009 at 06:56:51PM +0100, iive wrote:
>> >
>> > Log:
>> > doxygen style comments
>>
>> This completely and unnecessarily reverts my vertical alignment commit.
>> Now I have to waste time fixing conflicts.  Does this count as
>> obstruction?  If not, what does?
>
> great teamwork ...
>
> what do you 2 prefer?
> that i count the totally unneeded realigning done by diego as obstruction
> and the reversal mixed in with unrelated changes as incorrectly split
> -10 for both of you or that we just forget it?

It is inevitable that conflicts would arise when 2 devs
work on same file. I had to redo my changes few times
to commit.
I was on verge of svn cp my own version and commit it there.