yaffs Fixed a git merge conflict.

Signed-off-by: Timothy Manning <tfhmanning@gmail.com>

diff --git a/logo/README.txt b/logo/README.txt
index f4b1c2ef4354fd0afa5165989fd7a0a4c7b4e93d..ba1e5df85a78d54395b72db7dc166894c89a8424 100644 (file)
--- a/logo/README.txt
+++ b/logo/README.txt
@@ -1,15 +1,15 @@
 README -for YAFFS logo
 
 
-There are two different logos created. They were both created by Blender.
-There is a logo without textured legs which uses texture_1.png
-and a logo with textured legs which uses chip_uv_tex2.tga
+there are 3 different logos created. They were created by Blender.
+There is a logo_without_textured_legs which uses texture_1.png 
+-- a very simple chip to be used for very small black and white images.
 
-Blender uses absolute paths for imported texture files. This means that the
-textures need to reloaded into blender. For more infomation on how to do
-this please see the blender online tutorials. 
+There is also a logo_with_textured_legs_and_white_background which uses chip_uv_tex.png
+-- A chip with textured legs on a highlighted white plane.
+
+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

diff --git a/logo/chip_uv_tex.png b/logo/chip_uv_tex.png
new file mode 100644 (file)
index 0000000..6ae684b
Binary files /dev/null and b/logo/chip_uv_tex.png differ

diff --git a/logo/chip_uv_tex.xcf b/logo/chip_uv_tex.xcf
new file mode 100644 (file)
index 0000000..fb1d0ce
Binary files /dev/null and b/logo/chip_uv_tex.xcf differ

diff --git a/logo/chip_uv_tex2.tga b/logo/chip_uv_tex2.tga
index 7ab8cd7170076de865dc7d0913bc055f1d90ad3e..19fd4791124233ccbf56be3c388538002f0dd164 100644 (file)
Binary files a/logo/chip_uv_tex2.tga and b/logo/chip_uv_tex2.tga differ

diff --git a/logo/chip_uv_tex2.xcf b/logo/chip_uv_tex2.xcf
new file mode 100644 (file)
index 0000000..278c54a
Binary files /dev/null and b/logo/chip_uv_tex2.xcf differ

diff --git a/logo/how_to_render_logo_with_textured_legs_alpha.pdf b/logo/how_to_render_logo_with_textured_legs_alpha.pdf
new file mode 100644 (file)
index 0000000..b044da3
Binary files /dev/null and b/logo/how_to_render_logo_with_textured_legs_alpha.pdf differ

diff --git a/logo/logo_with_textured_legs_alpha.blend b/logo/logo_with_textured_legs_alpha.blend
new file mode 100644 (file)
index 0000000..8e6926d
Binary files /dev/null and b/logo/logo_with_textured_legs_alpha.blend differ

diff --git a/logo/logo_with_textured_legs.blend b/logo/logo_with_textured_legs_and_white_background.blend
similarity index 66%
rename from logo/logo_with_textured_legs.blend
rename to logo/logo_with_textured_legs_and_white_background.blend
index 2980fbc07ccd39e0c9fed3305a1cbd942be30872..070404cfa3220e81471948156d70c939c3cd2037 100644 (file)
Binary files a/logo/logo_with_textured_legs.blend and b/logo/logo_with_textured_legs_and_white_background.blend differ

diff --git a/logo/logo_with_textured_legs_and_white_background.png b/logo/logo_with_textured_legs_and_white_background.png
new file mode 100644 (file)
index 0000000..2de7bc4
Binary files /dev/null and b/logo/logo_with_textured_legs_and_white_background.png differ

diff --git a/logo/logo_without_textured_legs.png b/logo/logo_without_textured_legs.png
new file mode 100644 (file)
index 0000000..373ebae
Binary files /dev/null and b/logo/logo_without_textured_legs.png differ

diff --git a/logo/official_logo.png b/logo/official_logo.png
new file mode 100644 (file)
index 0000000..0b5b992
Binary files /dev/null and b/logo/official_logo.png differ