qt 3.1 port planing

Bob Tanner kde-cygwin@mail.kde.org
Sat, 16 Nov 2002 14:59:09 -0600

On Saturday 16 November 2002 02:25 am, Ralf Habacker wrote:
> 2. Then the cvs merging problems has to be fixed. One often problem is,
> that the kde-cygwin sources uses $ID:$,
> the qt-copy from kde does not, so that the merge produces conflicts lik=
> this.

Did you fix all of these in branch?

I just did a check out of QT_CYGWIN_3_1_BRANCH and I find no files with $=
in them.

Does the conflict now show until you do the -j ?

Bob Tanner <tanner@real-time.com>         | Phone : (952)943-8700
http://www.mn-linux.org, Minnesota, Linux | Fax   : (952)943-8500
http://www.linuxjustworks.com             | Linux Just Works!        =20
Key fingerprint =3D AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288