Support fm:Version

diff --git a/cvstools/mergechangelogs b/cvstools/mergechangelogs
index 8f033a3f526bee1c9e675b74f7d1087767aec07c..52e455c516e9f0a68a2317526106e37918d48ffd 100755 (executable)
--- a/cvstools/mergechangelogs
+++ b/cvstools/mergechangelogs
@@ -109,7 +109,7 @@ sub format {
        if (/^(.{1,60})\s/) {
            print "  | \t$star $1\n";
            $star = " ";
-           $_ = $';
+           $_ = $'; # '
        } else {
            print "  | \t$star $_\n";
            $_ = "";
@@ -129,6 +129,8 @@ sub last_version {
 
     if (/name=.VERSION.>(.*?)</s) {
        $version = $1;
+    } elsif (/<fm:Version>(.*?)</s) {
+       $version = $1;
     } elsif (/^([\d\.]+)/) {
        $version = $1;
     } else {