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

Merge Conflict Resolution

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

..

add_way.js

…

copy.js

Add missing parameter to isComplete

2015-01-24 01:18:35 -05:00

drag.js

Fixed chrome selection bug (fixes #2151)

2014-07-15 14:43:08 +02:00

draw_way.js

…

draw.js

Suppress tail in walkthrough (fixes #2362)

2014-10-06 18:22:45 -07:00

edit.js

Configurable minimum editable zoom

2014-11-11 14:37:11 -08:00

hash.js

Return entities from iD.Connection via callbacks

2015-01-08 14:44:58 -05:00

hover.js

…

lasso.js

…

paste.js

Add Copy/Paste behaviors, context copybuffer

2015-01-07 10:41:05 -05:00

select.js

Unsuppress menu when reselecting

2015-02-24 14:16:51 -05:00

tail.js

…