]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
Merge remote branch 'refs/remotes/origin/plasmasheep/trak5source'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 11:55:01 +0000 (13:55 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 11:55:01 +0000 (13:55 +0200)
36 files changed:
textures/techpanelx/Tech crate.psd [new file with mode: 0755]
textures/techpanelx/crate.blend [new file with mode: 0755]
textures/techpanelx/diamond plate.blend [new file with mode: 0755]
textures/techpanelx/diamond plate.jpg [new file with mode: 0755]
textures/techpanelx/diamond plate.psd [new file with mode: 0755]
textures/techpanelx/dirt.blend [new file with mode: 0755]
textures/techpanelx/dirt.jpg [new file with mode: 0755]
textures/techpanelx/tech panel 1.blend [new file with mode: 0755]
textures/techpanelx/tech panel 1.psd [new file with mode: 0755]
textures/techpanelx/tech panel 2.blend [new file with mode: 0755]
textures/techpanelx/tech panel 2.jpg [new file with mode: 0755]
textures/techpanelx/tech panel 2.psd [new file with mode: 0755]
textures/techpanelx/tech panel 3.blend [new file with mode: 0755]
textures/techpanelx/tech panel 3.jpg [new file with mode: 0755]
textures/techpanelx/tech panel 3.psd [new file with mode: 0755]
textures/techpanelx/tech panel 4.blend [new file with mode: 0755]
textures/techpanelx/tech panel 4.psd [new file with mode: 0755]
textures/techpanelx/tech panel 5.blend [new file with mode: 0755]
textures/techpanelx/tech panel 5.blend1 [new file with mode: 0755]
textures/techpanelx/tech panel 5.jpg [new file with mode: 0755]
textures/techpanelx/tech panel 5.psd [new file with mode: 0755]
textures/techpanelx/tech panel 6.blend [new file with mode: 0755]
textures/techpanelx/tech panel 6.jpg [new file with mode: 0755]
textures/techpanelx/tech panel 6.psd [new file with mode: 0755]
textures/techpanelx/tech panel 7.blend [new file with mode: 0755]
textures/techpanelx/tech panel 7.blend1 [new file with mode: 0755]
textures/techpanelx/tech panel 7.jpg [new file with mode: 0755]
textures/techpanelx/tech panel 8.blend [new file with mode: 0755]
textures/techpanelx/tech panel 8.blend1 [new file with mode: 0755]
textures/techpanelx/tech panel 8.jpg [new file with mode: 0755]
textures/techpanelx/tech panel 8.psd [new file with mode: 0755]
textures/techpanelx/tech panel 9.blend [new file with mode: 0755]
textures/techpanelx/tech panel 9.blend1 [new file with mode: 0755]
textures/techpanelx/tech panel 9.jpg [new file with mode: 0755]
textures/techpanelx/tech panel 9.psd [new file with mode: 0755]
textures/techpanelx/techcrate.jpg [new file with mode: 0755]

diff --git a/textures/techpanelx/Tech crate.psd b/textures/techpanelx/Tech crate.psd
new file mode 100755 (executable)
index 0000000..3df571e
Binary files /dev/null and b/textures/techpanelx/Tech crate.psd differ
diff --git a/textures/techpanelx/crate.blend b/textures/techpanelx/crate.blend
new file mode 100755 (executable)
index 0000000..9ba3627
Binary files /dev/null and b/textures/techpanelx/crate.blend differ
diff --git a/textures/techpanelx/diamond plate.blend b/textures/techpanelx/diamond plate.blend
new file mode 100755 (executable)
index 0000000..af79f53
Binary files /dev/null and b/textures/techpanelx/diamond plate.blend differ
diff --git a/textures/techpanelx/diamond plate.jpg b/textures/techpanelx/diamond plate.jpg
new file mode 100755 (executable)
index 0000000..d8ef8f0
Binary files /dev/null and b/textures/techpanelx/diamond plate.jpg differ
diff --git a/textures/techpanelx/diamond plate.psd b/textures/techpanelx/diamond plate.psd
new file mode 100755 (executable)
index 0000000..9bc3dc8
Binary files /dev/null and b/textures/techpanelx/diamond plate.psd differ
diff --git a/textures/techpanelx/dirt.blend b/textures/techpanelx/dirt.blend
new file mode 100755 (executable)
index 0000000..58ca3bb
Binary files /dev/null and b/textures/techpanelx/dirt.blend differ
diff --git a/textures/techpanelx/dirt.jpg b/textures/techpanelx/dirt.jpg
new file mode 100755 (executable)
index 0000000..fd01195
Binary files /dev/null and b/textures/techpanelx/dirt.jpg differ
diff --git a/textures/techpanelx/tech panel 1.blend b/textures/techpanelx/tech panel 1.blend
new file mode 100755 (executable)
index 0000000..a7fce24
Binary files /dev/null and b/textures/techpanelx/tech panel 1.blend differ
diff --git a/textures/techpanelx/tech panel 1.psd b/textures/techpanelx/tech panel 1.psd
new file mode 100755 (executable)
index 0000000..e2a2f1f
Binary files /dev/null and b/textures/techpanelx/tech panel 1.psd differ
diff --git a/textures/techpanelx/tech panel 2.blend b/textures/techpanelx/tech panel 2.blend
new file mode 100755 (executable)
index 0000000..f060c0e
Binary files /dev/null and b/textures/techpanelx/tech panel 2.blend differ
diff --git a/textures/techpanelx/tech panel 2.jpg b/textures/techpanelx/tech panel 2.jpg
new file mode 100755 (executable)
index 0000000..1090d9c
Binary files /dev/null and b/textures/techpanelx/tech panel 2.jpg differ
diff --git a/textures/techpanelx/tech panel 2.psd b/textures/techpanelx/tech panel 2.psd
new file mode 100755 (executable)
index 0000000..5be29a5
Binary files /dev/null and b/textures/techpanelx/tech panel 2.psd differ
diff --git a/textures/techpanelx/tech panel 3.blend b/textures/techpanelx/tech panel 3.blend
new file mode 100755 (executable)
index 0000000..fc69250
Binary files /dev/null and b/textures/techpanelx/tech panel 3.blend differ
diff --git a/textures/techpanelx/tech panel 3.jpg b/textures/techpanelx/tech panel 3.jpg
new file mode 100755 (executable)
index 0000000..97dab54
Binary files /dev/null and b/textures/techpanelx/tech panel 3.jpg differ
diff --git a/textures/techpanelx/tech panel 3.psd b/textures/techpanelx/tech panel 3.psd
new file mode 100755 (executable)
index 0000000..6759c5f
Binary files /dev/null and b/textures/techpanelx/tech panel 3.psd differ
diff --git a/textures/techpanelx/tech panel 4.blend b/textures/techpanelx/tech panel 4.blend
new file mode 100755 (executable)
index 0000000..c769988
Binary files /dev/null and b/textures/techpanelx/tech panel 4.blend differ
diff --git a/textures/techpanelx/tech panel 4.psd b/textures/techpanelx/tech panel 4.psd
new file mode 100755 (executable)
index 0000000..12548cd
Binary files /dev/null and b/textures/techpanelx/tech panel 4.psd differ
diff --git a/textures/techpanelx/tech panel 5.blend b/textures/techpanelx/tech panel 5.blend
new file mode 100755 (executable)
index 0000000..aac7655
Binary files /dev/null and b/textures/techpanelx/tech panel 5.blend differ
diff --git a/textures/techpanelx/tech panel 5.blend1 b/textures/techpanelx/tech panel 5.blend1
new file mode 100755 (executable)
index 0000000..4adfede
Binary files /dev/null and b/textures/techpanelx/tech panel 5.blend1 differ
diff --git a/textures/techpanelx/tech panel 5.jpg b/textures/techpanelx/tech panel 5.jpg
new file mode 100755 (executable)
index 0000000..b2339d3
Binary files /dev/null and b/textures/techpanelx/tech panel 5.jpg differ
diff --git a/textures/techpanelx/tech panel 5.psd b/textures/techpanelx/tech panel 5.psd
new file mode 100755 (executable)
index 0000000..2b75644
Binary files /dev/null and b/textures/techpanelx/tech panel 5.psd differ
diff --git a/textures/techpanelx/tech panel 6.blend b/textures/techpanelx/tech panel 6.blend
new file mode 100755 (executable)
index 0000000..7ace254
Binary files /dev/null and b/textures/techpanelx/tech panel 6.blend differ
diff --git a/textures/techpanelx/tech panel 6.jpg b/textures/techpanelx/tech panel 6.jpg
new file mode 100755 (executable)
index 0000000..40f3b49
Binary files /dev/null and b/textures/techpanelx/tech panel 6.jpg differ
diff --git a/textures/techpanelx/tech panel 6.psd b/textures/techpanelx/tech panel 6.psd
new file mode 100755 (executable)
index 0000000..8363bc6
Binary files /dev/null and b/textures/techpanelx/tech panel 6.psd differ
diff --git a/textures/techpanelx/tech panel 7.blend b/textures/techpanelx/tech panel 7.blend
new file mode 100755 (executable)
index 0000000..232f369
Binary files /dev/null and b/textures/techpanelx/tech panel 7.blend differ
diff --git a/textures/techpanelx/tech panel 7.blend1 b/textures/techpanelx/tech panel 7.blend1
new file mode 100755 (executable)
index 0000000..d555d3a
Binary files /dev/null and b/textures/techpanelx/tech panel 7.blend1 differ
diff --git a/textures/techpanelx/tech panel 7.jpg b/textures/techpanelx/tech panel 7.jpg
new file mode 100755 (executable)
index 0000000..0d95817
Binary files /dev/null and b/textures/techpanelx/tech panel 7.jpg differ
diff --git a/textures/techpanelx/tech panel 8.blend b/textures/techpanelx/tech panel 8.blend
new file mode 100755 (executable)
index 0000000..7c550ab
Binary files /dev/null and b/textures/techpanelx/tech panel 8.blend differ
diff --git a/textures/techpanelx/tech panel 8.blend1 b/textures/techpanelx/tech panel 8.blend1
new file mode 100755 (executable)
index 0000000..7c89490
Binary files /dev/null and b/textures/techpanelx/tech panel 8.blend1 differ
diff --git a/textures/techpanelx/tech panel 8.jpg b/textures/techpanelx/tech panel 8.jpg
new file mode 100755 (executable)
index 0000000..8b93dab
Binary files /dev/null and b/textures/techpanelx/tech panel 8.jpg differ
diff --git a/textures/techpanelx/tech panel 8.psd b/textures/techpanelx/tech panel 8.psd
new file mode 100755 (executable)
index 0000000..f41a738
Binary files /dev/null and b/textures/techpanelx/tech panel 8.psd differ
diff --git a/textures/techpanelx/tech panel 9.blend b/textures/techpanelx/tech panel 9.blend
new file mode 100755 (executable)
index 0000000..1f1a2a9
Binary files /dev/null and b/textures/techpanelx/tech panel 9.blend differ
diff --git a/textures/techpanelx/tech panel 9.blend1 b/textures/techpanelx/tech panel 9.blend1
new file mode 100755 (executable)
index 0000000..085f241
Binary files /dev/null and b/textures/techpanelx/tech panel 9.blend1 differ
diff --git a/textures/techpanelx/tech panel 9.jpg b/textures/techpanelx/tech panel 9.jpg
new file mode 100755 (executable)
index 0000000..250424f
Binary files /dev/null and b/textures/techpanelx/tech panel 9.jpg differ
diff --git a/textures/techpanelx/tech panel 9.psd b/textures/techpanelx/tech panel 9.psd
new file mode 100755 (executable)
index 0000000..88df61b
Binary files /dev/null and b/textures/techpanelx/tech panel 9.psd differ
diff --git a/textures/techpanelx/techcrate.jpg b/textures/techpanelx/techcrate.jpg
new file mode 100755 (executable)
index 0000000..5ea741e
Binary files /dev/null and b/textures/techpanelx/techcrate.jpg differ