[Pkg-javascript-commits] [backbone] 18/97: Merge commit 'upstream/0.5.1'

[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 b357087f5e4a78c65db5368f83d222c4d61a7d10
Merge: 03d9dab 554dde5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jul 14 02:51:20 2011 +0200

    Merge commit 'upstream/0.5.1'

 backbone-min.js                                    |   27 -
 backbone.js                                        |  512 +-
 docs/backbone-localstorage.html                    |    6 +-
 docs/backbone.html                                 |  598 ++-
 docs/images/basecamp-mobile.png                    |  Bin 0 -> 130256 bytes
 docs/images/bittorrent.jpg                         |  Bin 0 -> 107202 bytes
 docs/images/chop.png                               |  Bin 0 -> 158893 bytes
 docs/images/cloudapp.png                           |  Bin 0 -> 103212 bytes
 docs/images/decide.png                             |  Bin 0 -> 162234 bytes
 docs/images/flow.png                               |  Bin 0 -> 155078 bytes
 docs/images/fluxiom.png                            |  Bin 0 -> 79536 bytes
 docs/images/instagreat.png                         |  Bin 0 -> 185408 bytes
 docs/images/menagerievet.png                       |  Bin 0 -> 76753 bytes
 docs/images/quietwrite.png                         |  Bin 0 -> 116586 bytes
 docs/images/quoteroller.png                        |  Bin 0 -> 112608 bytes
 docs/images/soundcloud.png                         |  Bin 0 -> 131782 bytes
 docs/images/substance.png                          |  Bin 0 -> 44983 bytes
 docs/images/tilemill.png                           |  Bin 0 -> 152798 bytes
 docs/images/tzigla.png                             |  Bin 0 -> 283085 bytes
 docs/todos.html                                    |   10 +-
 examples/backbone-localstorage.js                  |    6 +-
 examples/todos/index.html                          |    4 +-
 examples/todos/todos.js                            |   12 +-
 index.html                                         | 1015 +++-
 index.js                                           |    1 +
 package.json                                       |    2 +-
 test/collection.js                                 |  219 +-
 test/controller.js                                 |   81 -
 test/events.js                                     |   28 +
 test/model.js                                      |  153 +-
 test/noconflict.js                                 |   12 +
 test/router.js                                     |  116 +
 test/sync.js                                       |   32 +-
 test/test-zepto.html                               |    8 +-
 test/test.html                                     |    9 +-
 test/vendor/{jquery-1.4.2.js => jquery-1.5.js}     | 5068 ++++++++++++++------
 test/vendor/qunit.css                              |  203 +-
 test/vendor/qunit.js                               | 1183 +++--
 .../{underscore-1.1.3.js => underscore-1.1.6.js}   |  137 +-
 test/vendor/zepto-0.2.js                           |  276 --
 test/vendor/zepto-0.6.js                           |  692 +++
 test/view.js                                       |   86 +-
 42 files changed, 7403 insertions(+), 3093 deletions(-)

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