diff options
| author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-09 21:55:44 +0400 |
|---|---|---|
| committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-09 21:55:44 +0400 |
| commit | d603aa28e31b7a8c9bf3da7d7408885c2fca03d4 (patch) | |
| tree | 674daeb3def25953cf7b1a251be93cf9385cf53b /libs | |
| parent | 757815fc2cd8207caf3f50ad6c2463d317236916 (diff) | |
| parent | d9ff5001ecfe0fc763e62dc3a9363fc4a45d02d3 (diff) | |
Merge branch 'master' into 2.x-twig
Conflicts:
.travis.yml
Diffstat (limited to 'libs')
| -rwxr-xr-x | libs/jqplot/build_minified_script.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/jqplot/build_minified_script.sh b/libs/jqplot/build_minified_script.sh index 7276679ae1..5a0efd25df 100755 --- a/libs/jqplot/build_minified_script.sh +++ b/libs/jqplot/build_minified_script.sh @@ -1,7 +1,7 @@ # build jqplot-custom.min.js # the yuicompressor needs to be set up in piwik/js (see piwik/js/README.md) -find . -name 'jqplot*.js' -print|xargs cat > jqplot-custom.min.js-temp +find . -name 'jqplot.*.js' -print|xargs cat > jqplot-custom.min.js-temp java -jar ../../js/yuicompressor-2.4.2/build/yuicompressor-2.4.2.jar --type js --line-break 1000 jqplot-custom.min.js-temp > jqplot-custom.min.js |