# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1286970797 -3600
# Node ID 84fefe1cd57fec2175724f5e598449586cd71c3c
# Parent  2a78c4ff2eab0f9fcba03c435a6d47601fd9a121# Parent  91da8db1df45df539265fb0b282187d4ee67f42c
merge

diff -r 2a78c4ff2eab -r 84fefe1cd57f commands/drvinfo/drvinfo.cpp
diff -r 2a78c4ff2eab -r 84fefe1cd57f core/builtins/ls.cif
diff -r 2a78c4ff2eab -r 84fefe1cd57f core/group/fshell_core.iby
--- a/core/group/fshell_core.iby	Wed Oct 13 12:41:05 2010 +0100
+++ b/core/group/fshell_core.iby	Wed Oct 13 12:53:17 2010 +0100
@@ -209,7 +209,6 @@
 
 FSHELL_EXECUTABLE_FILE(tlast.exe)
 FSHELL_EXECUTABLE_FILE(tconsole.exe)
-FSHELL_EXECUTABLE_FILE(fshell_tinteger.exe)
 FSHELL_EXECUTABLE_FILE(tfshellarguments.exe)
 FSHELL_EXECUTABLE_FILE(tenvarguments.exe)
 FSHELL_EXECUTABLE_FILE(tnoncifenvarguments.exe)
diff -r 2a78c4ff2eab -r 84fefe1cd57f documentation/change_history.pod