Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-11 17:01:57 +00:00
parent 6418bb6d23
commit a22ddfb666
74 changed files with 905 additions and 1190 deletions

View File

@@ -198,7 +198,7 @@ public class ContentMetadataExtracter extends ActionExecuterAbstractBase
}
@Override
protected void addParameterDefintions(List<ParameterDefinition> arg0)
protected void addParameterDefinitions(List<ParameterDefinition> arg0)
{
// None!
}