Skip to content

Commit f183222

Browse files
BSVinoBSVino
committed
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
2 parents cdc12e4 + b7ad25a commit f183222

File tree

346 files changed

+33285
-12925
lines changed

Some content is hidden

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

346 files changed

+33285
-12925
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.swp
33
.project
44
node_modules
5+
.idea/

‎bower.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"ignore": [
1515
"**/.*",
1616
"*.md",
17-
"docs",
18-
"editor",
19-
"examples/*",
20-
"!examples/js",
21-
"src",
22-
"test",
23-
"utils",
24-
"LICENSE"
17+
"/docs",
18+
"/editor",
19+
"/examples/*",
20+
"!/examples/js",
21+
"/src",
22+
"/test",
23+
"/utils",
24+
"/LICENSE"
2525
]
2626
}

0 commit comments

Comments
 (0)