On Wed, 2007-08-08 at 14:45 +0200, cvs@abisource.com wrote:
>
> +/*<<<<<<< .mine TODO check
> + // RIVERA kill annotation preview on change of mouse context
> + if ((m_prevMouseContext != EV_EMC_HYPERLINK) &&
> + (m_bAnnotationPreviewActive==true) &&
> + (m_pAnnotationPview != NULL))
> + {
> + UT_DEBUGMSG(("getMouseContext: Deleting annotation
> preview...\n"));
> + killAnnotationPreview();
> + }
> +
> +=======*/
There still seem to be quite some merge errors committed (even though
they are comments)
Marc
Received on Wed Aug 8 17:15:44 2007
This archive was generated by hypermail 2.1.8 : Wed Aug 08 2007 - 17:15:45 CEST