Files
iD/js
Tom MacWright 5e28faa6a1 Merge branch 'tagging' into tagging-merge
Conflicts:
	index.html
	js/iD/Controller.js
	js/iD/Entity.js
	js/iD/controller/edit/EditBaseState.js
2012-10-17 12:29:28 -04:00
..
2012-10-16 23:36:54 -04:00