[mkgmap-dev] Commit: r2343: Merge the style include branch.