chickenk Messages: 171 Registered: May 2007 Location: Grenoble, France
Experienced Member
@bytefield:
it seems you applied the patch I submitted a few days ago. Mirek did its own (slightly different) correction, and since the same lines are involved, it causes svn conflicts.The best for you is to delete the faulty files X11Wnd.cpp and CtrlDraw.cpp and do a 'svn up' again.