[Pkg-javascript-commits] [backbone] 170/173: Merge tag 'upstream/1.3.3_dfsg'

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository backbone.

commit 3597cdfb6059d7ecf366ae1546aa0796c0e57dec
Merge: f7556a7 a03a668
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Aug 31 00:58:41 2016 +0200

    Merge tag 'upstream/1.3.3_dfsg'
    
    Upstream version 1.3.3~dfsg
    
    # gpg: Underskrift lavet ons 31 aug 2016 00:58:41 CEST med RSA nøgle-id 2C7C3146C1A00121
    # gpg: God underskrift fra »Jonas Smedegaard <dr at jones.dk>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <js at debian.org>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <jonas at homebase.dk>« [ultimativ]
    # gpg:        også kendt som »[jpeg image of size 4165]« [ultimativ]

 .eslintrc                         |   91 ++
 .travis.yml                       |    6 +-
 LICENSE                           |    2 +-
 README.md                         |    7 +-
 backbone.js                       |  198 ++--
 bower.json                        |    4 +-
 component.json                    |   13 -
 docs/backbone.html                |  748 ++++++++-------
 docs/backbone.localStorage.html   |    2 +-
 docs/jsl.conf                     |   44 -
 examples/backbone.localStorage.js |    2 +-
 index.html                        |  154 +++-
 karma.conf-sauce.js               |   16 +-
 package.json                      |   41 +-
 test/.eslintrc                    |   15 +
 test/collection.js                | 1826 ++++++++++++++++++++++---------------
 test/events.js                    |  486 +++++-----
 test/model.js                     | 1156 ++++++++++++-----------
 test/noconflict.js                |    9 +-
 test/router.js                    |  540 ++++++-----
 test/setup/environment.js         |    2 +
 test/sync.js                      |  194 ++--
 test/view.js                      |  434 +++++----
 23 files changed, 3405 insertions(+), 2585 deletions(-)

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