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

[Diego Biurrun]

On Sat, Feb 14, 2009 at 08:15:54PM +0100, Michael Niedermayer 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?

Let's forget it.

Diego