[Pkg-javascript-commits] [backbone] 111/211: Merge branch 'master' of github.com:documentcloud/backbone

[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 12661ff159fd2ca767a4aa80ba3967b0d9acf068
Merge: 7b494c1 f4cfbd6
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Mon Apr 18 09:19:15 2011 -0400

    Merge branch 'master' of github.com:documentcloud/backbone

 backbone.js                |  19 ++++++--
 docs/images/flow.png       | Bin 0 -> 155078 bytes
 docs/images/soundcloud.png | Bin 0 -> 131782 bytes
 index.html                 | 118 +++++++++++++++++++++++++++++++++++----------
 test/noconflict.js         |  12 +++++
 test/test.html             |   1 +
 6 files changed, 121 insertions(+), 29 deletions(-)

diff --cc test/test.html
index b654ad5,46dbad0..091d107
--- a/test/test.html
+++ b/test/test.html
@@@ -7,9 -7,10 +7,10 @@@
    <script type="text/javascript" src="vendor/jquery-1.5.js"></script>
    <script type="text/javascript" src="vendor/qunit.js"></script>
    <script type="text/javascript" src="vendor/jslitmus.js"></script>
 -  <script type="text/javascript" src="vendor/underscore-1.1.5.js"></script>
 +  <script type="text/javascript" src="vendor/underscore-1.1.6.js"></script>
    <script type="text/javascript" src="../backbone.js"></script>
  
+   <script type="text/javascript" src="noconflict.js"></script>
    <script type="text/javascript" src="events.js"></script>
    <script type="text/javascript" src="model.js"></script>
    <script type="text/javascript" src="collection.js"></script>

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