removing settouchpoints from ontouchend

Author: hrishit

lib/p5.js

@@ -1,4 +1,4 @@
-/*! p5.js v0.3.2 August 16, 2014 */
+/*! p5.js v0.3.2 August 17, 2014 */
 var shim = function (require) {
     window.requestDraw = function () {
       return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {
@@ -2991,13 +2991,6 @@ var inputmouse = function (require, core, constants) {
       if (!this.isMousePressed) {
         if (typeof context.mouseMoved === 'function') {
           context.mouseMoved(e);
-<<<<<<< HEAD
-        } else if (typeof context.touchMoved === 'function') {
-          e.preventDefault();
-          this.setTouchPoints(e);
-          context.touchMoved(e);
-=======
->>>>>>> e2e3627b5b11113d6d7425704b4c4d54fa4c9f76
         }
       } else {
         if (typeof context.mouseDragged === 'function') {
@@ -3126,7 +3119,6 @@ var inputtouch = function (require, core) {
     };
     p5.prototype.ontouchend = function (e) {
       var context = this._isGlobal ? window : this;
-      this.setTouchPoints(e);
       if (typeof context.touchEnded === 'function') {
         e.preventDefault();
         context.touchEnded(e);

lib/p5.min.js

@@ -199,13 +199,6 @@ define(function (require) {
       if (typeof context.mouseMoved === 'function') {
         //e.preventDefault();
         context.mouseMoved(e);
-<<<<<<< HEAD
-      } else if (typeof context.touchMoved === 'function') {
-        e.preventDefault();
-        this.setTouchPoints(e);
-        context.touchMoved(e);
-=======
->>>>>>> e2e3627b5b11113d6d7425704b4c4d54fa4c9f76
       }
     }
     else {

src/input/mouse.js

@@ -107,7 +107,6 @@ define(function (require) {
    */
   p5.prototype.ontouchend = function(e) {
     var context = this._isGlobal ? window : this;
-    this.setTouchPoints(e);
     if (typeof context.touchEnded === 'function') {
       e.preventDefault();
       context.touchEnded(e);