Re: [Mapbuilder-devel] merge starting

2007-07-06 Thread Steven M. Ottens
sorry folks, the whole merge is taking much more time than expected so you can't commit anything this weekend. I'm still in the process of merging and after that I've to check the conflicts, unfortunately I'm gone part of the weekend so can't do anything, while gone. Hopefully I'll have ever

[Mapbuilder-devel] merge starting

2007-07-06 Thread Steven M. Ottens
hi all, I'm starting to merge ol-integration sand box with trunk, so please do not commit in either of the, it will probably be lost. Hopefully it will be over in a few hours Steven - This SF.net email is sponsored by DB2