| branch | popcorn-port |
| changeset 517 | 97599ff43072 |
| parent 511 | 81eb8e686456 |
| child 520 | fe008e95a716 |
--- a/src/js/main.js Wed Dec 21 16:06:41 2011 +0100 +++ b/src/js/main.js Fri Dec 23 10:46:07 2011 +0100 @@ -43,6 +43,8 @@ $L.wait(function() { IriSP.jQuery = window.jQuery.noConflict( true ); + IriSP._ = window._.noConflict(); + IriSP.underscore = IriSP._; var css_link_jquery = IriSP.jQuery( "<link>", { rel: "stylesheet",