Merge V1.2.0 BRANCH to HEAD

svn merge -r 2566:2569 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-03-22 16:21:14 +00:00
parent 506e408ca7
commit d4d33c1e34
5 changed files with 82 additions and 32 deletions

View File

@@ -44,9 +44,9 @@ public interface DescriptorService
public Descriptor getInstalledRepositoryDescriptor();
/**
* Gets the License Service
* Gets the License Descriptor
*
* @return the license service
* @return the license descriptor
*/
public LicenseDescriptor getLicenseDescriptor();