Merge remote branch 'origin/master' into mirceakitsune/preview_images
authorSamual <samual@xonotic.org>
Tue, 3 Jan 2012 16:44:07 +0000 (11:44 -0500)
committerSamual <samual@xonotic.org>
Tue, 3 Jan 2012 16:44:07 +0000 (11:44 -0500)
gfx/menu/nopreview/nopreview.xcf [new file with mode: 0644]
gfx/menu/nopreview/nopreview_luminos.tga [new file with mode: 0644]
gfx/menu/nopreview/nopreview_wickedx.tga [new file with mode: 0644]
gfx/menu/nopreview/nopreview_xaw.tga [new file with mode: 0644]
gfx/menu/nopreview/old/nopreview_map.psd [new file with mode: 0644]
gfx/menu/nopreview/old/nopreview_menuskin.psd [new file with mode: 0644]
gfx/menu/nopreview/old/nopreview_player.psd [new file with mode: 0644]

diff --git a/gfx/menu/nopreview/nopreview.xcf b/gfx/menu/nopreview/nopreview.xcf
new file mode 100644 (file)
index 0000000..216b380
Binary files /dev/null and b/gfx/menu/nopreview/nopreview.xcf differ
diff --git a/gfx/menu/nopreview/nopreview_luminos.tga b/gfx/menu/nopreview/nopreview_luminos.tga
new file mode 100644 (file)
index 0000000..c4fed58
Binary files /dev/null and b/gfx/menu/nopreview/nopreview_luminos.tga differ
diff --git a/gfx/menu/nopreview/nopreview_wickedx.tga b/gfx/menu/nopreview/nopreview_wickedx.tga
new file mode 100644 (file)
index 0000000..2fc5c5d
Binary files /dev/null and b/gfx/menu/nopreview/nopreview_wickedx.tga differ
diff --git a/gfx/menu/nopreview/nopreview_xaw.tga b/gfx/menu/nopreview/nopreview_xaw.tga
new file mode 100644 (file)
index 0000000..7b01510
Binary files /dev/null and b/gfx/menu/nopreview/nopreview_xaw.tga differ
diff --git a/gfx/menu/nopreview/old/nopreview_map.psd b/gfx/menu/nopreview/old/nopreview_map.psd
new file mode 100644 (file)
index 0000000..8307537
Binary files /dev/null and b/gfx/menu/nopreview/old/nopreview_map.psd differ
diff --git a/gfx/menu/nopreview/old/nopreview_menuskin.psd b/gfx/menu/nopreview/old/nopreview_menuskin.psd
new file mode 100644 (file)
index 0000000..a65f86f
Binary files /dev/null and b/gfx/menu/nopreview/old/nopreview_menuskin.psd differ
diff --git a/gfx/menu/nopreview/old/nopreview_player.psd b/gfx/menu/nopreview/old/nopreview_player.psd
new file mode 100644 (file)
index 0000000..86a7eab
Binary files /dev/null and b/gfx/menu/nopreview/old/nopreview_player.psd differ