dojo
Advanced tools
Comparing version 1.11.9 to 1.11.10
@@ -82,3 +82,3 @@ define(["../global", "../has", "./config", "require", "module"], function(global, has, config, require, module){ | ||
var rev = "$Rev: cbadea27 $".match(/[0-9a-f]{7,}/); | ||
var rev = "$Rev: acd41449 $".match(/[0-9a-f]{7,}/); | ||
dojo.version = { | ||
@@ -96,3 +96,3 @@ // summary: | ||
major: 1, minor: 11, patch: 9, flag: "", | ||
major: 1, minor: 11, patch: 10, flag: "", | ||
revision: rev ? rev[0] : NaN, | ||
@@ -99,0 +99,0 @@ toString: function(){ |
{ | ||
"name": "dojo", | ||
"version": "1.11.9", | ||
"version": "1.11.10", | ||
"directories": { | ||
@@ -14,3 +14,3 @@ "lib": "." | ||
"sinon": "1.12.2", | ||
"dojo": "1.11.9" | ||
"dojo": "1.11.10" | ||
}, | ||
@@ -17,0 +17,0 @@ "main": "main", |
@@ -16,3 +16,3 @@ define([ | ||
sval = source[name]; | ||
if(tval !== sval){ | ||
if(name !== '__proto__' && tval !== sval){ | ||
if(tval && typeof tval === 'object' && sval && typeof sval === 'object'){ | ||
@@ -19,0 +19,0 @@ exports.deepCopy(tval, sval); |
4625783