diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
| commit | f0c7612bcd49d32e408e67ac1829ee891c677f7e (patch) | |
| tree | d4cff4aa2d728524b631776ffffee71f42056421 /library/jslider/Makefile | |
| parent | 43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff) | |
| parent | 10102ac2ac4d5b02012a9794e23656717ab05556 (diff) | |
| download | volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.gz volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.bz2 volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
Diffstat (limited to 'library/jslider/Makefile')
| -rw-r--r-- | library/jslider/Makefile | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/library/jslider/Makefile b/library/jslider/Makefile deleted file mode 100644 index 0559b48e5..000000000 --- a/library/jslider/Makefile +++ /dev/null @@ -1,15 +0,0 @@ - -css_compiler: js_compiler - mkdir -p bin - cat css/jslider.css css/jslider.blue.css css/jslider.plastic.css css/jslider.round.css css/jslider.round.plastic.css > bin/jquery.slider.all.css - java -jar tools/yuicompressor-2.4.7.jar --type=css bin/jquery.slider.all.css > bin/jquery.slider.min.css - rm -f bin/jquery.slider.all.css - -js_compiler: - mkdir -p bin - rm -f bin/jquery.slider.all.js bin/jquery.slider.min.js - cat js/jshashtable-2.1_src.js js/jquery.numberformatter-1.2.3.js js/tmpl.js js/jquery.dependClass-0.1.js js/draggable-0.1.js js/jquery.slider.js > bin/jquery.slider.all.js - uglifyjs -nc bin/jquery.slider.all.js > bin/jquery.slider.min.js - rm -f bin/jquery.slider.all.js - - |