ref: 12456bf78730f24735bce5d7a2fdd9700df78d3e
parent: 19da8f07905d644693be648b67fa9926c9c60646
parent: e0f46e9a44dec8725438a23708679494c315e2b6
author: Matthew Stephure <matt.stephure@calgaryscientific.com>
date: Wed Jan 29 09:03:02 EST 2014
Merge branch 'master' into pweb-4037-crossbridge
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -11,6 +11,13 @@
}
}
},
+
+ concat: {+ libs: {+ src: ['h264bsd_asm.js',' sylvester.js', 'glUtils.js', 'util.js', 'canvas.js', 'h264bsd.js'],
+ dest: 'dist/h264bsd.min.js'
+ }
+ },
//grunt-clean
clean: {