diff options
author | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
commit | e2e2479984b3aaadb4c0947e5ec15276e5c9a337 (patch) | |
tree | 1662c1772cbcb6e44d017cea28e35d45de44921f /lib/dojo/_base/config.js | |
parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dojo/_base/config.js')
-rw-r--r-- | lib/dojo/_base/config.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dojo/_base/config.js b/lib/dojo/_base/config.js index a637258c8..7740d0225 100644 --- a/lib/dojo/_base/config.js +++ b/lib/dojo/_base/config.js @@ -1,8 +1,8 @@ /* - Copyright (c) 2004-2012, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2016, The JS Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ //>>built -define("dojo/_base/config",["../has","require"],function(_1,_2){var _3={};if(1){var _4=_2.rawConfig,p;for(p in _4){_3[p]=_4[p];}}else{var _5=function(_6,_7,_8){for(p in _6){p!="has"&&_1.add(_7+p,_6[p],0,_8);}};_3=1?_2.rawConfig:this.dojoConfig||this.djConfig||{};_5(_3,"config",1);_5(_3.has,"",1);}return _3;});
\ No newline at end of file +define("dojo/_base/config",["../has","require"],function(_1,_2){var _3={};if(1){var _4=_2.rawConfig,p;for(p in _4){_3[p]=_4[p];}}else{var _5=function(_6,_7,_8){for(p in _6){p!="has"&&_1.add(_7+p,_6[p],0,_8);}};var _9=(function(){return this;})();_3=1?_2.rawConfig:_9.dojoConfig||_9.djConfig||{};_5(_3,"config",1);_5(_3.has,"",1);}if(!_3.locale&&typeof navigator!="undefined"){var _a=(navigator.languages&&navigator.languages.length)?navigator.languages[0]:(navigator.language||navigator.userLanguage);if(_a){_3.locale=_a.toLowerCase();}}return _3;});
\ No newline at end of file |