Merge remote branch 'refs/remotes/origin/fruitiex/gakarmor'

diff --git a/textures/gakarmor_pants.tga b/textures/gakarmor_pants.tga
deleted file mode 100644 (file)
index 3bfa2f8..0000000
Binary files a/textures/gakarmor_pants.tga and /dev/null differ

diff --git a/textures/pyria_pants.tga b/textures/pyria_pants.tga
deleted file mode 100644 (file)
index 0b6a69c..0000000
Binary files a/textures/pyria_pants.tga and /dev/null differ

diff --git a/textures/pyria_shirt.tga b/textures/pyria_shirt.tga
index ff448abc5333a5bf83afebd1b20a5d02d4dce78e..62ca44604f4d9736719c222be9223426f44df80c 100644 (file)
Binary files a/textures/pyria_shirt.tga and b/textures/pyria_shirt.tga differ

diff --git a/textures/reptile.tga b/textures/reptile.tga
deleted file mode 100644 (file)
index 2090bb1..0000000
Binary files a/textures/reptile.tga and /dev/null differ

diff --git a/textures/reptile_bump.tga b/textures/reptile_bump.tga
deleted file mode 100644 (file)
index 27c5754..0000000
Binary files a/textures/reptile_bump.tga and /dev/null differ

diff --git a/textures/reptile_gloss.tga b/textures/reptile_gloss.tga
deleted file mode 100644 (file)
index 9647cde..0000000
Binary files a/textures/reptile_gloss.tga and /dev/null differ

diff --git a/textures/reptile_glow.tga b/textures/reptile_glow.tga
deleted file mode 100644 (file)
index 15b3071..0000000
Binary files a/textures/reptile_glow.tga and /dev/null differ

diff --git a/textures/reptile_pants.tga b/textures/reptile_pants.tga
deleted file mode 100644 (file)
index a7d8359..0000000
Binary files a/textures/reptile_pants.tga and /dev/null differ

diff --git a/textures/reptile_shirt.tga b/textures/reptile_shirt.tga
deleted file mode 100644 (file)
index 0e3023f..0000000
Binary files a/textures/reptile_shirt.tga and /dev/null differ

diff --git a/textures/umbra_pants.tga b/textures/umbra_pants.tga
deleted file mode 100644 (file)
index 754f78a..0000000
Binary files a/textures/umbra_pants.tga and /dev/null differ

diff --git a/textures/umbra_shirt.tga b/textures/umbra_shirt.tga
index d2fdc31f44dd1ec09408fc38397e8b9d6c78e3f3..8d04c364cc12551c79bb65cbf9d313e6150eeae1 100644 (file)
Binary files a/textures/umbra_shirt.tga and b/textures/umbra_shirt.tga differ