[Kwintv] Re: kdenonbeta/kwintv3/qtvision

[Rizsanyi Zsolt]

On Thursday 19 December 2002 01:20, George Staikos wrote:
> On December 18, 2002 19:14, Rizsanyi Zsolt wrote:
> > CVS commit by rizsanyi:
> >
> > fix problems with not clearing channel numbers (those appearing when
> > changing channels) from osd
> >
> >
> >   M +6 -0      osdmanager.cpp   1.11
> >   M +2 -0      osdmanager.h   1.11
> >   M +5 -0      plugins/osd/elegant/elegant.cpp   1.10
> >   M +1 -0      plugins/osd/elegant/elegant.h   1.8
> >   M +7 -1      plugins/osd/haze/haze.cpp   1.20
> >   M +2 -1      plugins/osd/haze/haze.h   1.10
> >   M +1 -1      qtvision.cpp   1.112
> >   M +1 -0      qvosdplugin.h   1.7
>
>   ARGH!!  I just finished the same fix literally 2 minutes after you did.
> :-) Got lots of commit conflicts.  Anyways I probably have a slightly more
> robust fix for this (it adds more functionality to the OSD too).  I will
> try to merge my fix with yours later tonight or tomorrow.

I said that I will commit this today, no? :) Maybe I should commit it 
yesterday without testing, and then you would be more happy ;))

Happy hacking

Zsolt