> Author: rjek > Date: Wed Aug 8 19:19:45 2007 > New Revision: 3487 > > URL: http://source.netsurf-browser.org?rev=3487&view=rev > Log: > Merge changes 3299,3304-3307,3311,3312,3317,3318,3322-3325,3328,3330-3334 from > trunk in 1 branch
In future we should use the svnmerge tool for this. It does the merge automatically, tracks what's been merged already, etc. James
