[Scummvm-cvs-logs] scummvm branch-1-3 -> 4752c35272b7e7ddbb509cb9e0fdd99a1893846f

[sunmax]

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:
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


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