Re: Annotations was: Merge branch 'master' into text-annotations-ingwa

2013-01-05 Thread Inge Wallin
On Friday, January 04, 2013 17:20:08 Gopalakrishna Bhat wrote: > On Wed, Jan 2, 2013 at 8:15 AM, Inge Wallin wrote: > > On Monday, December 31, 2012 10:44:45 Inge Wallin wrote: > > > Git commit c766b2149928783ae435ea8dba0ab36a43cbd593 by Inge Wallin. > > > Committed on 31/12/2012 at 10:43. > > > P

Re: Annotations was: Merge branch 'master' into text-annotations-ingwa

2013-01-04 Thread Gopalakrishna Bhat
On Wed, Jan 2, 2013 at 8:15 AM, Inge Wallin wrote: > On Monday, December 31, 2012 10:44:45 Inge Wallin wrote: > > Git commit c766b2149928783ae435ea8dba0ab36a43cbd593 by Inge Wallin. > > Committed on 31/12/2012 at 10:43. > > Pushed by ingwa into branch 'text-annotations-ingwa'. > > > > Merge branc

Annotations was: Merge branch 'master' into text-annotations-ingwa

2013-01-01 Thread Inge Wallin
On Monday, December 31, 2012 10:44:45 Inge Wallin wrote: > Git commit c766b2149928783ae435ea8dba0ab36a43cbd593 by Inge Wallin. > Committed on 31/12/2012 at 10:43. > Pushed by ingwa into branch 'text-annotations-ingwa'. > > Merge branch 'master' into text-annotations-ingwa > > Conflicts: > l