Skip to content

Commit 3e23921

Browse files
bhoustonbhouston
committed
Merge branch 'dev' of git@github.com:mrdoob/three.js into phong_diffuseColor
Conflicts: examples/js/ShaderSkin.js examples/js/ShaderTerrain.js examples/js/shaders/NormalDisplacementShader.js src/renderers/shaders/ShaderChunk/lights_phong_fragment.glsl src/renderers/shaders/ShaderChunk/linear_to_gamma_fragment.glsl src/renderers/shaders/ShaderChunk/map_fragment.glsl src/renderers/shaders/ShaderChunk/map_particle_fragment.glsl
2 parents 487e008 + 0f7e38e commit 3e23921

359 files changed

Lines changed: 10458 additions & 6306 deletions

File tree

Some content is hidden

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

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright © 2010-2014 three.js authors
3+
Copyright © 2010-2015 three.js authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎bower.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "three.js",
3-
"version": "0.0.69",
3+
"version": "0.0.70",
44
"homepage": "http://threejs.org/",
55
"description": "JavaScript 3D library",
66
"main": "build/three.js",
@@ -17,7 +17,8 @@
1717
"*.md",
1818
"docs",
1919
"editor",
20-
"examples",
20+
"examples/*",
21+
"!examples/js",
2122
"src",
2223
"test",
2324
"utils",

0 commit comments

Comments
 (0)