[Pkg-javascript-commits] [backbone] 168/211: Merge branch '0.5.0'

[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 dae2527113f4444e0e1d8feebede7186ac230868
Merge: 6b229ff d7e3d5b
Author: Paul Uithol <paul.uithol at gmail.com>
Date:   Thu May 26 21:42:13 2011 +0200

    Merge branch '0.5.0'
    
    Conflicts:
    	backbone.js

 backbone.js                       | 167 +++++++++++++++++++++-------------
 examples/todos/todos.js           |   2 +-
 index.html                        | 182 +++++++++++++++++++++-----------------
 package.json                      |   2 +-
 test/collection.js                |  32 ++++---
 test/{controller.js => router.js} |  53 +++++------
 test/test-zepto.html              |   2 +-
 test/test.html                    |   2 +-
 8 files changed, 256 insertions(+), 186 deletions(-)

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