Re: riverae - r21691 - in abiword/branches/RiveraESoC/src: af/xap/xp text/fmt/xp wp/ap/unix wp/ap/xp

> +/*<<<<<<< .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();
> + }
> +
> +=======*/
> +

Uh oh, committing conflicted files. NOT GOOD.

Hub
Received on Wed Aug 8 15:54:45 2007