# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1254759449 -3600
# Node ID 339b33d6402f6abf11c531cbcf9b214e45a3faa4
# Parent  a18cdecf36b32825d8ecfabd36205dcbeb50649b# Parent  1bdf644455fe9f2495f976efb9412c0c3cc18f37
catchup merge.

diff -r a18cdecf36b3 -r 339b33d6402f common/tools/brag/bragForDiamonds.xsl
--- a/common/tools/brag/bragForDiamonds.xsl	Mon Oct 05 17:17:06 2009 +0100
+++ b/common/tools/brag/bragForDiamonds.xsl	Mon Oct 05 17:17:29 2009 +0100
@@ -8,6 +8,7 @@
 	<xsl:variable name="unknownCount" select="count(phase/step/failures[@level!='critical' and @level!='major' and @level!='minor']/failure)"/>
 
 	<diamonds-build>
+	<schema>13</schema>
 	<build>
 	<status>
 	<xsl:choose>
diff -r a18cdecf36b3 -r 339b33d6402f common/tools/mergeXML.pl
--- a/common/tools/mergeXML.pl	Mon Oct 05 17:17:06 2009 +0100
+++ b/common/tools/mergeXML.pl	Mon Oct 05 17:17:29 2009 +0100
@@ -38,7 +38,7 @@
 {
 	print <<"EOT";
 
-mergeXML.pl --xsl=brag.xsl --merge=SystemDefinition,systemModel,layer(name),block(name),package(name) sysModel1.xml [model2.xml ...] > output.xml
+mergeXML.pl --xsl=brag.xsl --merge=SystemDefinition,systemModel,layer(name),block(name),package(name) sysModel1.xml [model*.xml ...] > output.xml
 EOT
 	exit(0 + !$help);
 }
@@ -52,6 +52,9 @@
 	$mergeTags->{$tag} = $attribute;
 }
 
+# Expand wildcards
+@ARGV = map { glob $_ } @ARGV;
+
 # Merge all the trees together
 my $outTree = mergeMultipleTrees($mergeTags, @ARGV);