diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-06 15:30:37 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-06 15:30:37 +0100 |
| commit | fa6eb468613603bfa2571f2e456468878bfe0b95 (patch) | |
| tree | aab6fbeae127acd5b49b88cb0be70bce1d433fa9 /src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java | |
| parent | 7ea719da26b29976e7227b4846953d24ced709d8 (diff) | |
| parent | 683d490074d93baa8a47db7ec43b7bd31145a12a (diff) | |
| download | cpptasks-parallel-fa6eb468613603bfa2571f2e456468878bfe0b95.tar.gz cpptasks-parallel-fa6eb468613603bfa2571f2e456468878bfe0b95.tar.bz2 cpptasks-parallel-fa6eb468613603bfa2571f2e456468878bfe0b95.tar.xz cpptasks-parallel-fa6eb468613603bfa2571f2e456468878bfe0b95.zip | |
Merged with cpptasks-1.0b5
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java')
| -rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java | 6 |
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) |