Permalink
Browse files

Merge remote branch 'upstream/yui-3.4.0+' into docfixes

  • Loading branch information...
2 parents 9c82942 + 3327eba commit 641466b3c6a7593d2e55ee35a01e84e1f9ed14b2 @lsmith lsmith committed Sep 2, 2011
View
2 src/querystring/querystring-parse.properties
@@ -9,4 +9,4 @@ srcdir=../..
component=querystring-parse
component.jsfiles=querystring-parse.js
component.requires=array-extras, yui-base
-component.overrides=querystring-parse-simple
+component.supersedes=querystring-parse-simple
View
2 src/querystring/querystring-stringify.properties
@@ -9,4 +9,4 @@ srcdir=../..
component=querystring-stringify
component.requires=yui-base
component.jsfiles=querystring-stringify.js
-component.overrides=querystring-stringify-simple
+component.supersedes=querystring-stringify-simple

0 comments on commit 641466b

Please sign in to comment.