[Pkg-javascript-commits] [backbone] 03/74: resolving merge

[Jonas Smedegaard]

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

js pushed a commit to tag 0.3.0
in repository backbone.

commit 0c611074f0410d8fc85940ab51693dbdc0d6527a
Merge: 013e45c 3ba999c
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Mon Oct 25 11:55:03 2010 -0400

    resolving merge

 backbone-min.js    |  27 +++----
 backbone.js        |  93 +++++++++++++---------
 docs/backbone.html | 146 ++++++++++++++++++-----------------
 index.html         | 221 +++++++++++++++++++++++++++++++++++++----------------
 package.json       |   2 +-
 test/collection.js |  22 ++++++
 test/view.js       |  14 +++-
 7 files changed, 338 insertions(+), 187 deletions(-)

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