Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 21:46:37 +0100] rev 500
merging with Lauren't changeset.
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 21:36:17 +0100] rev 499
merge with Laurent's changeset (essentially ignore all changes).
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 21:34:20 +0100] rev 498
merge with Laurent's changeset (essentially, ignore all changes).
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 15:36:08 +0100] rev 497
merging with Laurent's changes.
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 15:34:33 +0100] rev 496
merging with Laurent's change.
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 15:30:38 +0100] rev 495
merging with Laurent's revision 55b074ea7255 (essentially ignoring all changes)