merged slider changes

This commit is contained in:
jonobr1 2011-01-24 14:09:16 -08:00
parent a039298731
commit 8cf2f47f5a

View File

@ -80,11 +80,7 @@ var NumberController = function() {
} else if(isDragged) {
if(inc != slider.value) inc = slider.value;
}
<<<<<<< HEAD
updateValue(inc);
=======
return false;
>>>>>>> b8323ce896a851bbe5a18e17bff36a5bdaa97db1
}, false);
function updateValue(val) {