Bryan Housel 1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution ...

Merge Conflict Resolution

2015-03-05 19:49:15 -05:00

..

actions

Merge pull request #2525 from openstreetmap/conflict-resolution

2015-03-05 19:49:15 -05:00

behavior

Write presets and imagery to standalone files

2014-10-23 15:52:29 -07:00

core

Pend some failing tests

2015-03-03 21:06:28 -05:00

geo

fix tests affected by change in equality testing re #2388

2014-10-28 21:49:31 -04:00

lib

add Diff3 library

2014-12-13 22:49:44 -05:00

modes

Write presets and imagery to standalone files

2014-10-23 15:52:29 -07:00

presets

…

renderer

Add minzoom check to map.zoom() (closes #2499)

2015-01-13 23:09:19 -05:00

svg

Write presets and imagery to standalone files

2014-10-23 15:52:29 -07:00

ui

Write presets and imagery to standalone files

2014-10-23 15:52:29 -07:00

util

…

countrycode.js

…

geo.js

bump chai to 1.9.2 and fix tests affected by change in equality testing

2014-10-28 21:37:04 -04:00

id.js

Add tests and documentation for custom presets

2014-10-23 15:52:29 -07:00

presets.js

Moved area-keys to data, and process it during runtime

2014-10-23 15:52:29 -07:00

spec_helpers.js

…

svg.js

…

taginfo.js

…

util.js

…