[Scummvm-cvs-logs] scummvm branch-1-3-1 -> cf2bd3f6bd6c9053edf289ec303870d69d12b3a1

sev- sev at scummvm.org
Mon Jul 4 14:07:45 CEST 2011


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

Summary:
9b2c2dbfee Removed $URL$ and $Id$, as they don't get expanded by git.
4752c35272 Merge branch 'branch-1-3' of git at github.com:scummvm/scummvm into branch-1-3
584da65a1d AUDIO: fix issue in detectDevice when config manager setting is missing
97674b66b8 REDHAT: Update list of packaged data files
3595529c43 BUILD: Update the windows installer script.
cf2bd3f6bd Merge branch 'branch-1-3' into branch-1-3-1


Commit: 9b2c2dbfeee94c50d8ece0937cbe1fed4a911155
    https://github.com/scummvm/scummvm/commit/9b2c2dbfeee94c50d8ece0937cbe1fed4a911155
Author: Max Lingua (sunmax at libero.it)
Date: 2011-07-03T13:46:54-07:00

Commit Message:
Removed $URL$ and $Id$, as they don't get expanded by git.

Minor aesthetic cleanup in common/stream.h.

Changed paths:
    backends/platform/ps2/DmaPipe.cpp
    backends/platform/ps2/DmaPipe.h
    backends/platform/ps2/Gs2dScreen.cpp
    backends/platform/ps2/Gs2dScreen.h
    backends/platform/ps2/GsDefs.h
    backends/platform/ps2/asyncfio.cpp
    backends/platform/ps2/asyncfio.h
    backends/platform/ps2/eecodyvdfs.c
    backends/platform/ps2/eecodyvdfs.h
    backends/platform/ps2/fileio.cpp
    backends/platform/ps2/fileio.h
    backends/platform/ps2/icon.cpp
    backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h
    backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h
    backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
    backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h
    backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
    backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.h
    backends/platform/ps2/iop/CoDyVDfs/iop/irx_imports.h
    backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c
    backends/platform/ps2/iop/rpckbd/src/irx_imports.h
    backends/platform/ps2/irxboot.cpp
    backends/platform/ps2/irxboot.h
    backends/platform/ps2/ps2debug.h
    backends/platform/ps2/ps2input.cpp
    backends/platform/ps2/ps2input.h
    backends/platform/ps2/ps2mutex.cpp
    backends/platform/ps2/ps2pad.cpp
    backends/platform/ps2/ps2pad.h
    backends/platform/ps2/ps2time.cpp
    backends/platform/ps2/savefilemgr.cpp
    backends/platform/ps2/savefilemgr.h
    backends/platform/ps2/sysdefs.h
    backends/platform/ps2/systemps2.cpp
    backends/platform/ps2/systemps2.h




Commit: 4752c35272b7e7ddbb509cb9e0fdd99a1893846f
    https://github.com/scummvm/scummvm/commit/4752c35272b7e7ddbb509cb9e0fdd99a1893846f
Author: Max Lingua (sunmax at libero.it)
Date: 2011-07-03T13:50:16-07:00

Commit Message:
Merge branch 'branch-1-3' of git at github.com:scummvm/scummvm into branch-1-3

Changed paths:
    NEWS




Commit: 584da65a1d03d4feff8e29c7219ce49096595b7f
    https://github.com/scummvm/scummvm/commit/584da65a1d03d4feff8e29c7219ce49096595b7f
Author: athrxx (athrxx at scummvm.org)
Date: 2011-07-03T23:38:29-07:00

Commit Message:
AUDIO: fix issue in detectDevice when config manager setting is missing

Changed paths:
    audio/mididrv.cpp




Commit: 97674b66b8f71f3128f5e0b243b44a018529ff11
    https://github.com/scummvm/scummvm/commit/97674b66b8f71f3128f5e0b243b44a018529ff11
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-07-04T02:18:00-07:00

Commit Message:
REDHAT: Update list of packaged data files

Changed paths:
    dists/redhat/scummvm.spec
    dists/redhat/scummvm.spec.in




Commit: 3595529c435638640d57925ef7ace3232044fe16
    https://github.com/scummvm/scummvm/commit/3595529c435638640d57925ef7ace3232044fe16
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-07-04T02:46:18-07:00

Commit Message:
BUILD: Update the windows installer script.

Changed paths:
    dists/win32/ScummVM.iss




Commit: cf2bd3f6bd6c9053edf289ec303870d69d12b3a1
    https://github.com/scummvm/scummvm/commit/cf2bd3f6bd6c9053edf289ec303870d69d12b3a1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-07-04T05:05:31-07:00

Commit Message:
Merge branch 'branch-1-3' into branch-1-3-1

Changed paths:
    audio/mididrv.cpp
    backends/platform/ps2/DmaPipe.cpp
    backends/platform/ps2/DmaPipe.h
    backends/platform/ps2/Gs2dScreen.cpp
    backends/platform/ps2/Gs2dScreen.h
    backends/platform/ps2/GsDefs.h
    backends/platform/ps2/asyncfio.cpp
    backends/platform/ps2/asyncfio.h
    backends/platform/ps2/eecodyvdfs.c
    backends/platform/ps2/eecodyvdfs.h
    backends/platform/ps2/fileio.cpp
    backends/platform/ps2/fileio.h
    backends/platform/ps2/icon.cpp
    backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h
    backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h
    backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
    backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h
    backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
    backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.h
    backends/platform/ps2/iop/CoDyVDfs/iop/irx_imports.h
    backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c
    backends/platform/ps2/iop/rpckbd/src/irx_imports.h
    backends/platform/ps2/irxboot.cpp
    backends/platform/ps2/irxboot.h
    backends/platform/ps2/ps2debug.h
    backends/platform/ps2/ps2input.cpp
    backends/platform/ps2/ps2input.h
    backends/platform/ps2/ps2mutex.cpp
    backends/platform/ps2/ps2pad.cpp
    backends/platform/ps2/ps2pad.h
    backends/platform/ps2/ps2time.cpp
    backends/platform/ps2/savefilemgr.cpp
    backends/platform/ps2/savefilemgr.h
    backends/platform/ps2/sysdefs.h
    backends/platform/ps2/systemps2.cpp
    backends/platform/ps2/systemps2.h
    dists/redhat/scummvm.spec
    dists/redhat/scummvm.spec.in
    dists/win32/ScummVM.iss








More information about the Scummvm-git-logs mailing list