Merge remote branch 'refs/remotes/origin/morphed/uzi_texture'

diff --git a/textures/uzi.tga b/textures/uzi.tga
index ecd2637266aa034223560efef952c7b0ade64555..45f2d9bf79db2a5cd12418a32c1300dc18f0af3e 100644 (file)
Binary files a/textures/uzi.tga and b/textures/uzi.tga differ

diff --git a/textures/uzi_norm.tga b/textures/uzi_norm.tga
index 574490877779c7f5fcc2716865a2724288a89968..8df77a4da1bc10cb8d9bf105f2087222ed63f38e 100644 (file)
Binary files a/textures/uzi_norm.tga and b/textures/uzi_norm.tga differ

diff --git a/textures/uzi_pants.tga b/textures/uzi_pants.tga
index 82d1ca29ce821e6f2e636d2e1fbe89bfd700f000..62f6659ed81d4ba362fd6bcc3348b5e96dcc2fa8 100644 (file)
Binary files a/textures/uzi_pants.tga and b/textures/uzi_pants.tga differ

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