summaryrefslogtreecommitdiff
path: root/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java')
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java6
1 files changed, 3 insertions, 3 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..4ddcd14 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
@@ -210,9 +210,9 @@ 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()) {
VersionInfo refVersion = (VersionInfo)