Skip to content

Commit b93fbf2

Browse files
committedNov 30, 2015
Merge pull request #2 from e-andersson/3d-tiles-tree-loading
Merge into 3d-tiles
2 parents 6602734 + 345ed2d commit b93fbf2

File tree

2,866 files changed

+167714
-65631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,866 files changed

+167714
-65631
lines changed
 

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Thumbs.db
88
/Apps/CesiumViewer/Gallery/gallery-index.js
99

1010
/Apps/Sandcastle/jsHintOptions.js
11-
/Apps/Sandcastle/.jshintrc
1211
/Apps/Sandcastle/gallery/gallery-index.js
1312

1413
/Source/Cesium.js
@@ -17,7 +16,6 @@ Thumbs.db
1716
/Source/Shaders/*/*.js
1817
/Source/Shaders/*/*/*.js
1918

20-
/Specs/.jshintrc
2119
/Specs/SpecList.js
2220

2321
/node_modules

‎.jshintrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"forin": true,
77
"freeze": true,
88
"immed": true,
9-
"latedef": "nofunc",
9+
"latedef": false,
1010
"newcap": true,
1111
"noarg": true,
1212
"noempty": true,
@@ -46,7 +46,7 @@
4646
"couch": false,
4747
"devel": true,
4848
"dojo": false,
49-
"jasmine": false,
49+
"jasmine": true,
5050
"jquery": false,
5151
"mocha": true,
5252
"mootools": false,
@@ -59,4 +59,4 @@
5959
"worker": false,
6060
"wsh": false,
6161
"yui": false
62-
}
62+
}

0 commit comments

Comments
 (0)
Please sign in to comment.