yaffs Fixed a git merge conflict.
authorTimothy Manning <tfhmanning@gmail.com>
Thu, 10 Feb 2011 23:17:28 +0000 (12:17 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Thu, 10 Feb 2011 23:17:28 +0000 (12:17 +1300)
Signed-off-by: Timothy Manning <tfhmanning@gmail.com>
NANDFailureMitigation.odt [new file with mode: 0644]
YaffsFaq.odt
logo/README.txt

diff --git a/NANDFailureMitigation.odt b/NANDFailureMitigation.odt
new file mode 100644 (file)
index 0000000..6cab29b
Binary files /dev/null and b/NANDFailureMitigation.odt differ
index 62f946d..613ab82 100644 (file)
Binary files a/YaffsFaq.odt and b/YaffsFaq.odt differ
index a746693..ba1e5df 100644 (file)
@@ -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