[Scummvm-cvs-logs] scummvm master -> f16064613bb6a39835d56bc6abe99b3e37ad7f93

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
732f9582fa GCW0: Remove absolute paths
f16064613b GCW0: Fix default joystick number


Commit: 732f9582fa368b810010cbebe89dc47a1defdba2
    https://github.com/scummvm/scummvm/commit/732f9582fa368b810010cbebe89dc47a1defdba2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T15:41:30-04:00

Commit Message:
GCW0: Remove absolute paths

Changed paths:
    dists/gcw0/scummvm.sh
    dists/gcw0/scummvmrc



diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
index 4ffb429..c12a303 100755
--- a/dists/gcw0/scummvm.sh
+++ b/dists/gcw0/scummvm.sh
@@ -3,7 +3,7 @@
 cd `dirname $0`
 
 if [ ! -f $HOME/.scummvmrc ] ; then
-	cp /mnt/ScummVM/scummvmrc $HOME/.scummvmrc
+	cp ./scummvmrc $HOME/.scummvmrc
 fi
 
-exec ./scummvm 2>&1 >$HOME/scummvm.log
+exec ./scummvm
diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
index 1f4043b..fcffd9a 100644
--- a/dists/gcw0/scummvmrc
+++ b/dists/gcw0/scummvmrc
@@ -2,8 +2,8 @@
 fullscreen=true
 gfx_mode=1x
 aspect_ratio=true
-themepath=/mnt/ScummVM/themes
+themepath=./themes
 browser_lastpath=/media
-extrapath=/mnt/ScummVM/engine-data
-pluginspath=/mnt/ScummVM/plugins
+extrapath=./engine-data
+pluginspath=./plugins
 joystick=0


Commit: f16064613bb6a39835d56bc6abe99b3e37ad7f93
    https://github.com/scummvm/scummvm/commit/f16064613bb6a39835d56bc6abe99b3e37ad7f93
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T15:57:26-04:00

Commit Message:
GCW0: Fix default joystick number

Changed paths:
    dists/gcw0/scummvmrc



diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
index fcffd9a..c2087c2 100644
--- a/dists/gcw0/scummvmrc
+++ b/dists/gcw0/scummvmrc
@@ -6,4 +6,4 @@ themepath=./themes
 browser_lastpath=/media
 extrapath=./engine-data
 pluginspath=./plugins
-joystick=0
+joystick_num=0