[Pkg-javascript-commits] [node-iscroll] 05/13: Merge tag 'upstream/5.1.3+dfsg1'

[Balint Reczey]

This is an automated email from the git hooks/post-receive script.

rbalint pushed a commit to branch master
in repository node-iscroll.

commit 120561758e5abbb9479dbd8ca36681c390ae97a4
Merge: 2ea7f37 b5cdb81
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Jun 1 21:16:52 2015 +0200

    Merge tag 'upstream/5.1.3+dfsg1'
    
    Upstream version 5.1.3+dfsg1
    
    Conflicts:
    	build/iscroll-infinite.js
    	build/iscroll-lite.js
    	build/iscroll-probe.js
    	build/iscroll-zoom.js
    	build/iscroll.js
    	package.json

 build/iscroll-infinite.js | 1579 --------------------------------
 build/iscroll-lite.js     |  944 -------------------
 build/iscroll-probe.js    | 2033 -----------------------------------------
 build/iscroll-zoom.js     | 2190 ---------------------------------------------
 build/iscroll.js          | 2006 -----------------------------------------
 package.json              |    4 +-
 src/wheel/wheel.js        |    9 +-
 7 files changed, 9 insertions(+), 8756 deletions(-)

diff --cc package.json
index f74fa11,90be17e..691c7a2
--- a/package.json
+++ b/package.json
@@@ -26,4 -26,4 +26,4 @@@
      "url": "https://github.com/cubiq/iscroll/issues"
    },
    "license": "MIT"
--}
++}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-iscroll.git