Code for delimited text provider
Added default value argument for readEntryList
switched default and ok arguments
Fix tab order in WMS dialog, change layer control to extended selection mode for usability
Merged with dev master
Delimited text fix compiling
Globe: Fix compilation with osgearth 2.4
Pre astyle
small update of the UI of the symbollayers widgets
After astyle
Fix html labels rendering before they are fully loaded. Prevents missing images in html labels when composer layout is output for the first time.
Merge pull request #512 from nyalldawson/blend_mode_fixes

Some blending fixes and code cleanup
GML parser boundedBy fix
[sextante] moved SilentProgress to independent module
[sextante] more tests
Merge pull request #513 from olivierdalang/SymbolLayerWidgetsUISmallUpdate

small update of the UI of the symbollayers widgets
Change point displacement renderer to work with new vector api
more qreal vs double issues for android
Merge remote-tracking branch 'upstream/master'
Merge pull request #511 from nyalldawson/html_labels_fix

Fix html labels rendering before they are fully loaded...