CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-05 14:38:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	index.html
	test/index.html
This commit is contained in:
Ansis Brammanis
2013-02-27 21:41:26 -05:00
parent 404488c54a 571edc707d
commit 4e6a3c322f
76 changed files with 1085 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+4 -3
View File
@@ -20,11 +20,11 @@
<script src='js/lib/jxon.js'></script>
<script src='js/lib/d3.typeahead.js'></script>
<script src='js/lib/d3.combobox.js'></script>
<script src='js/lib/d3.rowselect.js'></script>
<script src='js/lib/d3.geo.tile.js'></script>
<script src='js/lib/d3.size.js'></script>
<script src='js/lib/d3.trigger.js'></script>
<script src='js/lib/d3.keybinding.js'></script>
<script src='js/lib/d3.tail.js'></script>
<script src='js/lib/d3-compat.js'></script>
<script src='js/lib/bootstrap-tooltip.js'></script>
<script src='js/lib/rtree.js'></script>
@@ -91,7 +91,8 @@
<script src='js/id/ui/taglist.js'></script>
<script src='js/id/ui/presetgrid.js'></script>
<script src='js/id/ui/tageditor.js'></script>
<script src='js/id/ui/address.js'></script>
<script src='js/id/ui/tail.js'></script>
<script src='js/id/ui/preset/address.js'></script>
<script src='js/id/actions.js'></script>
<script src="js/id/actions/add_midpoint.js"></script>
@@ -107,7 +108,7 @@
<script src='js/id/actions/join.js'></script>
<script src='js/id/actions/merge.js'></script>
<script src='js/id/actions/move_node.js'></script>
<script src='js/id/actions/move_way.js'></script>
<script src='js/id/actions/move.js'></script>
<script src='js/id/actions/rotate_way.js'></script>
<script src='js/id/actions/circularize.js'></script>
<script src='js/id/actions/orthogonalize.js'></script>