[Pkg-javascript-commits] [backbone] 99/281: Merge branch 'replaceState' of https://github.com/lmp/backbone

[Jonas Smedegaard]

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

js pushed a commit to tag 0.9.0
in repository backbone.

commit 30a89ac5ccb8da53961ed809995fbc1edd48770a
Merge: f5acb6d df7c279
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Wed Nov 23 14:03:39 2011 -0500

    Merge branch 'replaceState' of https://github.com/lmp/backbone

 backbone.js          |  49 ++++++--
 docs/backbone.html   | 347 ++++++++++++++++++++++++++++-----------------------
 index.html           |  13 +-
 test/router.js       |  20 +++
 test/test.html       |   1 +
 test/test_helpers.js |  14 +++
 6 files changed, 271 insertions(+), 173 deletions(-)

diff --cc test/test.html
index 7dda5b3,d6e0ced..21f94ce
--- a/test/test.html
+++ b/test/test.html
@@@ -7,8 -7,9 +7,9 @@@
    <script type="text/javascript" src="vendor/jquery-1.6.4.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.2.1.js"></script>
 +  <script type="text/javascript" src="vendor/underscore-1.2.2.js"></script>
    <script type="text/javascript" src="../backbone.js"></script>
+   <script type="text/javascript" src="test_helpers.js"></script>
  
    <script type="text/javascript" src="noconflict.js"></script>
    <script type="text/javascript" src="events.js"></script>

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