use [].concat, not Ox.merge

This commit is contained in:
rolux 2012-05-24 10:22:56 +02:00
commit ee160efa3d
24 changed files with 85 additions and 90 deletions

View file

@ -311,7 +311,7 @@ appPanel
function loadBrowserMessage() {
var isMSIE = $.browser.msie,
browsers = Ox.merge(
browsers = [].concat(
isMSIE ? [{name: 'Chrome Frame', url: 'http://google.com/chromeframe/'}] : [],
[
{name: 'Chrome', url: 'http://google.com/chrome/'},