Resolving conflicts

Ralf Habacker
Fri, 22 Nov 2002 07:54:53 +0100

> I'm diving to resolving the non $Id$ conflicts. Since I'm pretty new to this 
> project, I'm not sure how to proceed, so I'll just post my questions as I 
> come to them.
> I've resolved all the conflicts expect for 21 of them, and they are 
> all in the 
> qmake/generators/unix/unixmake2.cpp.
I've asked Chris January some days ago if he can take a look into qmake. 

Chris, do you have any success ?