diff options
author | Pawel Spychalski (DzikuVx) <pspychalski@gmail.com> | 2018-03-27 23:05:59 +0300 |
---|---|---|
committer | Pawel Spychalski (DzikuVx) <pspychalski@gmail.com> | 2018-03-27 23:05:59 +0300 |
commit | c4735d2690e30b6fef7132e09a75c6f8bd3ff8a3 (patch) | |
tree | 9cc56c5a916380b9dbdc39e6af9f25f516646b13 /gulpfile.js | |
parent | eb208af39ddec4f1c8b0569cd93fd6a75bffbe9c (diff) | |
parent | 1204c0124160fa53b3f16c862a356c1149d453fa (diff) |
Merge remote-tracking branch 'origin/master' into dzikuvx-new-mixer-approach
Diffstat (limited to 'gulpfile.js')
-rw-r--r-- | gulpfile.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gulpfile.js b/gulpfile.js index fcf5735d..f90574f3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -56,6 +56,7 @@ sources.js = [ './js/libraries/google-analytics-bundle.js', './node_modules/jquery/dist/jquery.min.js', './node_modules/jquery-ui-npm/jquery-ui.min.js', + './node_modules/marked/lib/marked.js', './js/libraries/d3.min.js', './js/libraries/jquery.nouislider.all.min.js', './node_modules/three/three.min.js', @@ -128,6 +129,10 @@ sources.receiverJs = [ './tabs/receiver_msp.js' ]; +sources.debugTraceJs = [ + './js/debug_trace.js' +]; + sources.hexParserJs = [ './js/workers/hex_parser.js', ]; @@ -139,6 +144,7 @@ var output = { mapJs: 'map.js', receiverCss: 'receiver-msp.css', receiverJs: 'receiver-msp.js', + debugTraceJs: 'debug-trace.js', hexParserJs: 'hex_parser.js', }; |