Merge branch 'master' into open889

2016-05-10 23:09:59 -07:00
parent 2829b8d495 3727b287a1
commit 7c82e31b66
786 changed files with 411 additions and 1889 deletions
--- a/platform/commonUI/themes/espresso/bundle.js
+++ b/platform/commonUI/themes/espresso/bundle.js
@@ -19,7 +19,6 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define*/

 define([
    
@@ -28,7 +27,6 @@ define([
    
    legacyRegistry
 ) {
-    "use strict";

    legacyRegistry.register("platform/commonUI/themes/espresso", {
        "name": "Espresso",