resolving conflicts

This commit is contained in:
Eric Rowell
2013-08-11 21:36:18 -07:00
9 changed files with 811 additions and 988 deletions

View File

@@ -40,9 +40,9 @@ module.exports = function(grunt) {
'src/filters/Brighten.js',
'src/filters/Invert.js',
'src/filters/Blur.js',
'src/filters/Mask.js'/*,
'src/filters/Colors.js',
'src/filters/Convolution.js'*/
'src/filters/Mask.js',
'src/filters/ColorPack.js',
'src/filters/ConvolvePack.js'
];
var unitTestFiles = [