Merge remote-tracking branch 'origin/open669' into open-master

2015-02-04 13:05:30 -08:00
parent def47addb3 5949580b0a
commit 4f17071c85
9 changed files with 203 additions and 1 deletions
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -152,6 +152,26 @@
                "templateUrl": "templates/controls/switcher.html",
                "uses": [ "view" ]
            }
+        ],
+        "licenses": [
+            {
+                "name": "Modernizr",
+                "version": "2.6.2",
+                "description": "Browser/device capability finding.",
+                "author": "Faruk Ateş",
+                "website": "http://modernizr.com",
+                "license": "MIT",
+                "link": "http://modernizr.com/license/"
+            },
+            {
+                "name": "Normalize.css",
+                "version": "1.1.2",
+                "description": "Browser style normalization.",
+                "author": "Nicolas Gallagher, Jonathan Neal",
+                "website": "http://necolas.github.io/normalize.css/",
+                "license": "MIT",
+                "link": "https://github.com/necolas/normalize.css/blob/master/LICENSE.md"
+            }
        ]
    }
 }