# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1283014260 -3600
# Node ID 4df672617228c7023a9bab6815596618c353931a
# Parent  96bfe2624d23701d3bdc924bfdd7a89d3db7c1c2# Parent  a83fed0e0b9a119cbfdac8641cc84f4dfc19e39a
merge

diff -r 96bfe2624d23 -r 4df672617228 documentation/change_history.pod
--- a/documentation/change_history.pod	Sat Aug 28 14:21:25 2010 +0100
+++ b/documentation/change_history.pod	Sat Aug 28 17:51:00 2010 +0100
@@ -46,6 +46,8 @@
 
 fshell's current working directory is now normalised (via new TFileName2::Normalize function) so that the case matches what's on the filesystem).
 
+=back
+
 =head2 Release 000.2-000.5
 
 Test releases with build fixes.
diff -r 96bfe2624d23 -r 4df672617228 plugins/consoles/common/BMARM/consoleextensions.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/consoles/common/BMARM/consoleextensions.def	Sat Aug 28 17:51:00 2010 +0100
@@ -0,0 +1,10 @@
+EXPORTS
+	WriteStdErr__19MIosrvConsoleHelperRC7TDesC16 @ 1 NONAME R3UNUSED ; MIosrvConsoleHelper::WriteStdErr(TDesC16 const &)
+	Debug__C19MIosrvConsoleHelper @ 2 NONAME R3UNUSED ; MIosrvConsoleHelper::Debug(void) const
+	HandleConsoleCreationError__19MIosrvConsoleHelperRC7TDesC16i @ 3 NONAME R3UNUSED ; MIosrvConsoleHelper::HandleConsoleCreationError(TDesC16 const &, int)
+	MIosrvConsoleHelper_Extension__19MIosrvConsoleHelperUiRPvPv @ 4 NONAME ; MIosrvConsoleHelper::MIosrvConsoleHelper_Extension(unsigned int, void *&, void *)
+	Message__19MIosrvConsoleHelperQ219MIosrvConsoleHelper10TVerbosityGt11TRefByValue1ZC7TDesC16e @ 5 NONAME ; MIosrvConsoleHelper::Message(MIosrvConsoleHelper::TVerbosity, TRefByValue<TDesC16 const>,...)
+	SetDebug__19MIosrvConsoleHelperi @ 6 NONAME R3UNUSED ; MIosrvConsoleHelper::SetDebug(int)
+	UnderlyingConsole__C19MIosrvConsoleHelper @ 7 NONAME R3UNUSED ; MIosrvConsoleHelper::UnderlyingConsole(void) const
+	CleanupUnderlyingConsole__19MIosrvConsoleHelper @ 8 NONAME R3UNUSED ; MIosrvConsoleHelper::CleanupUnderlyingConsole(void)
+