Merge branch '1.2'

Author: sebastianbergmann

PHP/CodeCoverage/Report/HTML.php

@@ -188,6 +188,7 @@ protected function copyFiles($target)
     {
         $dir = $this->getDirectory($target . 'css');
         copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
+        copy($this->templatePath . 'css/nv.d3.css', $dir . 'nv.d3.css');
         copy($this->templatePath . 'css/style.css', $dir . 'style.css');
 
         $dir = $this->getDirectory($target . 'fonts');
@@ -198,10 +199,11 @@ protected function copyFiles($target)
 
         $dir = $this->getDirectory($target . 'js');
         copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
-        copy($this->templatePath . 'js/highcharts.js', $dir . 'highcharts.js');
+        copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
         copy($this->templatePath . 'js/holder.js', $dir . 'holder.js');
         copy($this->templatePath . 'js/html5shiv.js', $dir . 'html5shiv.js');
         copy($this->templatePath . 'js/jquery.js', $dir . 'jquery.js');
+        copy($this->templatePath . 'js/nv.d3.min.js', $dir . 'nv.d3.min.js');
         copy($this->templatePath . 'js/respond.min.js', $dir . 'respond.min.js');
     }