Re: aaditya - revision 31441

On 28/06/12 05:07 AM, Simon Larochelle wrote:
> 
> Aaditya,
> 
> I noticed that you have been working with an old version of
> fv_FrameEdit.cpp. I made some substantial modifications to that file
> back in February and your modifications will conflict with mine. It
> might be a good idea to update your branch before you move further.
> Since only a few modifications have been made to the files in the gr
> directory of trunk since the cairo branch was created, you should be
> able to update your branch without getting too many conflicts. Ah, the
> joys of SVN.

I think the mistake was to not merge trunk back to the branch he started
from.  I didn't think of that.

Maybe now would be the time to merge trunk to it.


Hub