[Pkg-javascript-commits] [backbone] 119/211: Merge remote branch 'remotes/upstream/master'

[Jonas Smedegaard]

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

js pushed a commit to tag 0.5.0
in repository backbone.

commit 0503b4d19e38b29e0d8e84006561cd50837a7e21
Merge: 7d88162 222d673
Author: Paul Uithol <paul.uithol at gmail.com>
Date:   Tue Apr 19 10:19:11 2011 +0200

    Merge remote branch 'remotes/upstream/master'
    
    Conflicts:
    	backbone.js

 backbone-min.js                                    |  27 -----
 backbone.js                                        |  79 +++++++------
 docs/images/flow.png                               | Bin 0 -> 155078 bytes
 docs/images/soundcloud.png                         | Bin 0 -> 131782 bytes
 examples/todos/index.html                          |   2 +-
 index.html                                         | 122 ++++++++++++++++-----
 test/collection.js                                 |   7 ++
 test/events.js                                     |  14 +++
 test/noconflict.js                                 |  12 ++
 test/sync.js                                       |  15 +--
 test/test-zepto.html                               |   2 +-
 test/test.html                                     |   3 +-
 .../{underscore-1.1.5.js => underscore-1.1.6.js}   |  32 ++++--
 13 files changed, 202 insertions(+), 113 deletions(-)

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