CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-24 17:14:04 +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
test/index.html
+3 -3
View File
@@ -26,7 +26,6 @@
<script src='../js/lib/d3.trigger.js'></script>
<script src='../js/lib/d3.typeahead.js'></script>
<script src='../js/lib/d3.one.js'></script>
<script src='../js/lib/d3.tail.js'></script>
<script src='../js/lib/ohauth.js'></script>
<script src='../js/lib/jxon.js'></script>
<script src="../js/lib/rtree.js"></script>
@@ -78,6 +77,7 @@
<script src='../js/id/ui/source_switch.js'></script>
<script src='../js/id/ui/tageditor.js'></script>
<script src='../js/id/ui/taglist.js'></script>
<script src='../js/id/ui/tail.js'></script>
<script src='../js/id/ui/toggle.js'></script>
<script src='../js/id/actions.js'></script>
@@ -96,7 +96,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/noop.js'></script>
<script src='../js/id/actions/reverse.js'></script>
@@ -180,7 +180,7 @@
<script src="spec/actions/join.js"></script>
<script src='spec/actions/merge.js'></script>
<script src="spec/actions/move_node.js"></script>
<script src="spec/actions/move_way.js"></script>
<script src="spec/actions/move.js"></script>
<script src="spec/actions/noop.js"></script>
<script src="spec/actions/reverse.js"></script>
<script src="spec/actions/split.js"></script>