From: Timothy Manning Date: Thu, 10 Feb 2011 23:17:28 +0000 (+1300) Subject: yaffs Fixed a git merge conflict. X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-docs;a=commitdiff_plain;h=d1ed16b737588a90f39d3e00c98afa22d84e3408;hp=def9806d4ba3c1879f7df782e265daaff3f1088c yaffs Fixed a git merge conflict. Signed-off-by: Timothy Manning --- diff --git a/NANDFailureMitigation.odt b/NANDFailureMitigation.odt new file mode 100644 index 0000000..6cab29b Binary files /dev/null and b/NANDFailureMitigation.odt differ diff --git a/YaffsFaq.odt b/YaffsFaq.odt index 62f946d..613ab82 100644 Binary files a/YaffsFaq.odt and b/YaffsFaq.odt differ diff --git a/logo/README.txt b/logo/README.txt index a746693..ba1e5df 100644 --- a/logo/README.txt +++ b/logo/README.txt @@ -12,7 +12,4 @@ Finally there is logo_with_textured_legs_alpha which uses chip_uv_tex2.tga -- This is the only logo which has a transparent background. -The pictures generated by these files have yet to be up loaded to -the YAFFS source control. - -Timothy Manning 04/10/2010