bodewig 2003/10/02 03:15:15 Modified: docs/manual/OptionalTasks Tag: ANT_16_BRANCH starteam.html src/main/org/apache/tools/ant/taskdefs/optional/starteam Tag: ANT_16_BRANCH StarTeamLabel.java Log: merge from HEAD Revision Changes Path No revision No revision 1.22.2.2 +5 -5 ant/docs/manual/OptionalTasks/starteam.html Index: starteam.html =================================================================== RCS file: /home/cvs/ant/docs/manual/OptionalTasks/starteam.html,v retrieving revision 1.22.2.1 retrieving revision 1.22.2.2 diff -u -r1.22.2.1 -r1.22.2.2 --- starteam.html 25 Sep 2003 09:26:48 -0000 1.22.2.1 +++ starteam.html 2 Oct 2003 10:15:15 -0000 1.22.2.2 @@ -565,6 +565,11 @@ <td align="center" valign="top">yes</td> </tr> <tr> + <td valign="top">description</td> + <td valign="top">A description of the label to be stored in the StarTeam project.</td> + <td align="center" valign="top">yes</td> + </tr> + <tr> <td valign="top">revisionlabel</td> <td valign="top">Yes means that the label attribute is to be saved as a "revision label". No (default) means that it will be saved as a "view label"</td> <td align="center" valign="top">no</td> @@ -581,11 +586,6 @@ <tr> <td valign="top">lastbuild</td> <td valign="top">The timestamp of the build that will be stored with the label. Must be formatted <code>yyyyMMddHHmmss</code></td> - <td align="center" valign="top">no</td> - </tr> - <tr> - <td valign="top">description</td> - <td valign="top">A description of the label to be stored in the StarTeam project.</td> <td align="center" valign="top">no</td> </tr> </table> No revision No revision 1.16.2.2 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java Index: StarTeamLabel.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -u -r1.16.2.1 -r1.16.2.2 --- StarTeamLabel.java 25 Sep 2003 09:26:48 -0000 1.16.2.1 +++ StarTeamLabel.java 2 Oct 2003 10:15:15 -0000 1.16.2.2 @@ -123,7 +123,7 @@ } /** - * Optional description of the label to be stored in the StarTeam project. + * Description of the label to be stored in the StarTeam project. */ public void setDescription(String description) { this.description = description;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]