Saman Bemel-Benrud 17f2d3a326 resolving conflict.

2013-02-12 20:21:09 -05:00

..

actions

Banish function ( style

2013-02-12 16:35:47 -05:00

behavior

iD constructors are camel case

2013-02-12 16:51:25 -08:00

core

Merge branch 'master' of github.com:systemed/iD

2013-02-12 16:35:53 -05:00

geo

Banish function ( style

2013-02-12 16:35:47 -05:00

modes

iD constructors are camel case

2013-02-12 16:51:25 -08:00

operations

Support merging points into an area (#435)

2013-02-06 13:42:34 -08:00

renderer

Banish function ( style

2013-02-12 16:35:47 -05:00

services

…

svg

Banish function ( style

2013-02-12 16:35:47 -05:00

ui

resolving conflict.

2013-02-12 20:21:09 -05:00

actions.js

…

behavior.js

…

connection.js

Banish function ( style

2013-02-12 16:35:47 -05:00

end.js

…

geo.js

Banish function ( style

2013-02-12 16:35:47 -05:00

id.js

Extract iD.ui.Zoom, add tooltips with key hint

2013-02-12 15:48:17 -08:00

modes.js

…

oauth.js

…

operations.js

…

start.js

…

svg.js

Banish function ( style

2013-02-12 16:35:47 -05:00

ui.js

iD constructors are camel case

2013-02-12 16:51:25 -08:00

util.js

Use a trueObj for filtering labels, add fastMouse

2013-02-08 10:08:30 -05:00

validate.js

…