[Marble-devel] Merging of branches

[Andrew Manson]

Hello all !

I have the great pleasure to announce that we have merged the Google Summer of 
Code Branch back into trunk. This means that trunk is back open for active 
development.

I would encourage as many people as possible to update their svn checkout and 
test as much as they can in the coming days just to make sure that we haven't 
missed anything. I don't expect any problems because there were no conflicts 
during the merge. 

Happy hacking and see you all at Akademy! 

-- 
Andrew Manson
Working for Marble Desktop Globe http://edu.kde.org/marble/
Implementing an OSM Annotation layer http://tinyurl.com/OSMMarble
Blog http://realate.blogspot.com