From 355c80088f396e21f412eb743620f3c70ff39023 Mon Sep 17 00:00:00 2001
From: Eric Rowell <erowell83@gmail.com>
Date: Sun, 11 Aug 2013 22:02:49 -0700
Subject: [PATCH] resolved some more merge issues

---
 src/filters/ColorPack.js    | 4 ++--
 src/filters/ConvolvePack.js | 2 +-
 tests/html/filterTests.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/filters/ColorPack.js b/src/filters/ColorPack.js
index dfc17464..c26306cc 100644
--- a/src/filters/ColorPack.js
+++ b/src/filters/ColorPack.js
@@ -90,7 +90,7 @@
         shift_hue(imageData, this.getFilterHueShiftDeg() % 360 );
     };
 
-    Kinetic.Node.addFilterGetterSetter(Kinetic.Image, 'filterHueShiftDeg', 0);
+    Kinetic.Factory.addFilterGetterSetter(Kinetic.Image, 'filterHueShiftDeg', 0);
     /**
      * get hue shift amount.  The shift amount is a number between 0 and 360.
      * @name getFilterBrightness
@@ -132,7 +132,7 @@
         shift_hue(imageData,hue);
     };
 
-    Kinetic.Node.addFilterGetterSetter(Kinetic.Image, 'filterColorizeColor', [255,0,0] );
+    Kinetic.Factory.addFilterGetterSetter(Kinetic.Image, 'filterColorizeColor', [255,0,0] );
     /**
      * Gets the colorizing color.
      * @name getFilterColorizeColor
diff --git a/src/filters/ConvolvePack.js b/src/filters/ConvolvePack.js
index 048eecde..1fe2a462 100644
--- a/src/filters/ConvolvePack.js
+++ b/src/filters/ConvolvePack.js
@@ -134,7 +134,7 @@
         return kernel;
     };
 
-    Kinetic.Node.addFilterGetterSetter(Kinetic.Image, 'filterAmount', 50);
+    Kinetic.Factory.addFilterGetterSetter(Kinetic.Image, 'filterAmount', 50);
     /**
      * get the current filter amount
      * @name getFilterAmount
diff --git a/tests/html/filterTests.html b/tests/html/filterTests.html
index 90f1d69a..afd6c072 100644
--- a/tests/html/filterTests.html
+++ b/tests/html/filterTests.html
@@ -6,7 +6,7 @@
 
         </style>
         <link rel="stylesheet" type="text/css"href="../base.css">
-        <script src="../../dist/kinetic-v0.0.0.js"></script>
+        <script src="../../dist/kinetic-dev.js"></script>
         <script src="../assets/dataUrls.js"></script>
         <script src="../js/Test.js"></script>
         <script src="../js/filterTests.js"></script>