# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1267462318 0
# Node ID 0e6a0a765dcd29ec914db68430be8617aa6dd08f
# Parent  aba9fdf7e82514bd0f21d1d1ccdf1320c02551a9# Parent  5190d528364bedad44e7cc65b99ad40c4d915745
merge from fix

diff -r 5190d528364b -r 0e6a0a765dcd .hgtags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Mon Mar 01 16:51:58 2010 +0000
@@ -0,0 +1,3 @@
+1e23e973ab856a45d9e3e2dcd9a72a9e466c03c7 stable
+1e23e973ab856a45d9e3e2dcd9a72a9e466c03c7 stable
+007900c31eef0363e705cf15d131740d4eeb6208 stable
diff -r 5190d528364b -r 0e6a0a765dcd sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Mon Mar 01 16:29:16 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Mon Mar 01 16:51:58 2010 +0000
@@ -1,6 +1,6 @@
 Release Notes for Symbian Build System v2
 
-next version
+version 2.12.4
 
 Defect Fixes:
 - SF Bug 2081 - [Raptor] - Exported file executable permissions not maintained (linux)
@@ -19,6 +19,12 @@
 - Stop copying .bmp files to epoc32/localisation and fix the "what" reporting
 
 
+version 2.12.3
+
+Defect Fixes:
+- Don't print trace "what" information if we do not run the trace compiler.
+
+
 version 2.12.2
 
 Defect Fixes:
diff -r 5190d528364b -r 0e6a0a765dcd sbsv2/raptor/lib/flm/tracecompiler.mk
diff -r 5190d528364b -r 0e6a0a765dcd sbsv2/raptor/python/raptor_version.py
--- a/sbsv2/raptor/python/raptor_version.py	Mon Mar 01 16:29:16 2010 +0000
+++ b/sbsv2/raptor/python/raptor_version.py	Mon Mar 01 16:51:58 2010 +0000
@@ -16,7 +16,7 @@
 
 # replace CHANGESET with the Hg changeset for ANY release
 
-version=(2,12,2,"2010-02-17","symbian build system","CHANGESET")
+version=(2,12,3,"2010-02-23","symbian build system","CHANGESET")
 
 def numericversion():
 	"""Raptor version string"""