MP: added an expiration collector to fix a mem leak
Add supplemental nicer-formatted JSON to Config.toJSON
Config: finish 'nicer' JSON output support
Merged incremental update
Merge pull request #1 from gwaldron/master

merge master osgearth
added include <cstring> to reenable compilation under linux
Merge pull request #365 from jklimke/master

Fixed Linux compilation issue with missing include
merge; update controls to use nodes instead of drawable lists
Merge branch 'master' of github.com:gwaldron/osgearth
Fix compile error in Controls.cpp on iOS.
Merge branch 'topic-controls' of https://github.com/gwaldron/osgearth into topic-controls
Controls: fix shader generation.
Merge branch 'topic-controls' of https://github.com/gwaldron/osgearth into topic-controls
Merge branch 'master' into topic-controls
Undo 888160f8 because the fix caused the nasty jitters; further investigate required
Fix: bug in TerrainLayer; no NULL check on tileSource when setting the cache policy
Fix: ShaderGenerator only needs VPs on leaf geoms; VP needs to build mains even in the absence of shader functions
Merge branch 'topic-controls' of https://github.com/gwaldron/osgearth into topic-controls
Optimization for ShaderGenerator (shared default state set)
Merge branch 'master' into topic-controls