Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

This commit is contained in:
Rudolf Polzer 2011-09-17 00:48:50 +02:00
commit 724b608a7c

View File

@ -230,7 +230,7 @@ screenshotthemap()
else
#startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8
#startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -gl_driver /usr/local/lib/gallium3d/libGL.so -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"set scr_screenshot_timestamp 0" +"scr_screenshot_name \"$M-\"" -- /usr/bin/Xvfb :8 -screen 0 1024x768x24
fi
)
if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then