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

This commit is contained in:
Tom MacWright
2012-12-04 11:32:27 -05:00
12 changed files with 13 additions and 13 deletions

View File

@@ -64,20 +64,20 @@
</script>
<!-- include spec files here... -->
<script src="spec/util.js"></script>
<script src="spec/background.js"></script>
<script src="spec/way.js"></script>
<script src="spec/map.js"></script>
<script src="spec/hash.js"></script>
<script src="spec/oauth.js"></script>
<script src="spec/graph.js"></script>
<script src="spec/entity.js"></script>
<script src="spec/history.js"></script>
<script src="spec/format/geojson.js"></script>
<script src="spec/format/xml.js"></script>
<script src="spec/graph/graph.js"></script>
<script src="spec/graph/entity.js"></script>
<script src="spec/graph/history.js"></script>
<script src="spec/graph/way.js"></script>
<script src="spec/renderer/background.js"></script>
<script src="spec/renderer/hash.js"></script>
<script src="spec/renderer/map.js"></script>
<script src="spec/renderer/style.js"></script>
<script src="spec/ui/inspector.js"></script>
<script src="spec/connection.js"></script>
<script src="spec/geojson.js"></script>
<script src="spec/xml.js"></script>
<script src="spec/style.js"></script>
<script src="spec/inspector.js"></script>
<script src="spec/oauth.js"></script>
<script src="spec/util.js"></script>
<script>
(window.mochaPhantomJS || window.mocha).run();