summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
diff options
context:
space:
mode:
authorcarnold <[email protected]>2008-04-02 22:14:50 +0000
committercarnold <[email protected]>2008-04-02 22:14:50 +0000
commit283e0b34eaf0fdca02214b152cf50d1b69a1936a (patch)
tree7cc6b7a51ce4b99a2e1c9b1f5bdbd783b6bd512e /src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
parent7919095f38d9536f02f1a9505d8fa55b69bd9c02 (diff)
Javadoc fixes
git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/cpptasks/trunk@159 32d7a393-a5a9-423c-abd3-5d954feb1f2f
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java')
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java b/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
index 3e70707..92cfeb0 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
@@ -210,8 +210,8 @@ public final class VersionInfo extends DataType {
}
/**
- * Returns a VersionInfo that reflects the state of
- * @return
+ * Returns a VersionInfo that reflects any inherited version information.
+ * @return merged version information.
*/
public VersionInfo merge() {
if (isReference()) {