Merge branch 'master' into fuzz-pipe

This commit is contained in:
Mike Morris
2014-07-09 19:20:43 -07:00
4 changed files with 15 additions and 12 deletions

View File

@@ -11,9 +11,7 @@
"layers": [
{
"id": "background",
"render": {
"type": "background"
},
"type": "background",
"style": {
"background-color": "red"
}
@@ -22,9 +20,7 @@
"id": "water",
"source": "mapbox",
"source-layer": "water",
"render": {
"type": "fill"
},
"type": "fill",
"style": {
"fill-color": "blue",
"fill-antialias": false

View File

@@ -11,9 +11,7 @@
"layers": [
{
"id": "background",
"render": {
"type": "background"
},
"type": "background",
"style": {
"background-color": "red"
}
@@ -22,9 +20,7 @@
"id": "water",
"source": "mapbox",
"source-layer": "water",
"render": {
"type": "fill"
},
"type": "fill",
"style": {
"fill-color": "blue"
}