Merge branch 'develop'

3DGenomes · Aug 21, 2015 · faea13f · faea13f
2 parents 58aa973 + b92a394
commit faea13f
Show file tree

Hide file tree

Showing 11 changed files with 35,162 additions and 51 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -67,7 +67,7 @@ gulp.task('dist-vendor', function() {
 		'bower_components/angular-uuid4/angular-uuid4.js',
 		'bower_components/papaparse/papaparse.min.js',
 		// 'bower_components/d3/d3.min.js', // see asset-libs below
-		// 'bower_components/threejs/build/three.js', // see asset-libs below
+		'bower_components/threejs/build/three.js', // see asset-libs below
 		'bower_components/threejs/examples/js/controls/TrackballControls.js',
 		'bower_components/threejs/examples/js/controls/OrbitControls.js',
 		])