graham 5342baa2a7 Merge branch 'master' into cvm ... Conflicts: etc/settings.csh etc/settings.sh		2010-03-23 11:43:17 +00:00
..
advanced	CLEANUP: remove most references to (deprecated) .ftr file format	2010-02-17 13:56:56 +01:00
conversion	ENH: initialised edge values to avoid compiler warning msg	2010-03-01 17:14:33 +00:00
generation	Merge branch 'master' into cvm	2010-03-23 11:43:17 +00:00
manipulation	STYLE: Remove unused static variable	2010-03-22 10:32:13 +00:00