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/errors/CancelError.js | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dojo/errors/CancelError.js')
| -rw-r--r-- | lib/dojo/errors/CancelError.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dojo/errors/CancelError.js b/lib/dojo/errors/CancelError.js index 5d6f9e653..16ab0288a 100644 --- a/lib/dojo/errors/CancelError.js +++ b/lib/dojo/errors/CancelError.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/errors/CancelError",["./create"],function(_1){return _1("CancelError",null,null,{dojoType:"cancel"});});
\ No newline at end of file +define("dojo/errors/CancelError",["./create"],function(_1){return _1("CancelError",null,null,{dojoType:"cancel",log:false});});
\ No newline at end of file |