Merge branch 'gsoc-2012-vectorosm' of git.kde.org:marble into gsoc-2012…

Authored by Ander Pijoan <ander.pijoan@deusto.es>.

Description

Merge branch 'gsoc-2012-vectorosm' of git.kde.org:marble into gsoc-2012-vectorosm

Details

Committed
Ander Pijoan <ander.pijoan@deusto.es>Jul 16 2012, 7:20 AM
Parents
R34:19201e481cfe: Pass a pointer of documents
R34:4e158aea749a: Commit before pull with Earthwings' changes.
Branches
Unknown
Tags
Unknown
Ander Pijoan <ander.pijoan@deusto.es> committed R34:0d7aa2dddf3c: Merge branch 'gsoc-2012-vectorosm' of git.kde.org:marble into gsoc-2012… (authored by Ander Pijoan <ander.pijoan@deusto.es>).Jul 16 2012, 7:20 AM

Merged Changes

CommitAuthorDetailsCommitted
19201e481cfenienhueser
Pass a pointer of documents 
Jul 15 2012
a7d55675c86anienhueser
Speed up json parsing by avoiding any operations on large strings. 
Jul 15 2012
cc323fd2c427nienhueser
Faster json parsing by caching rpt. method calls. Spare syntax check. 
Jul 15 2012
d902ebf1c221nienhueser
Fix lifetime/ownership problem between cache and tree model. 
Jul 15 2012
f4d06392e0fanienhueser
Fix crash at exit 
Jul 15 2012
6e3d54335e7cnienhueser
Tile server returns both onkothicdataresponse and onKothicDataResponse 
Jul 15 2012