diff options
| author | Willem Jan Palenstijn | 2012-02-23 22:43:56 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2012-02-23 22:49:59 +0100 |
| commit | 4637d55337d083d85bea762db7d59b47e92c0fbe (patch) | |
| tree | 38a53feb1d8ffcbb53a62635da18127e492e2905 /.gitignore | |
| parent | 6e70f7728915b766d647668a156b09f84a3c40cf (diff) | |
| parent | 7a3e0ea45300ba950d71ba0eae9381a0b0869f01 (diff) | |
| download | scummvm-rg350-4637d55337d083d85bea762db7d59b47e92c0fbe.tar.gz scummvm-rg350-4637d55337d083d85bea762db7d59b47e92c0fbe.tar.bz2 scummvm-rg350-4637d55337d083d85bea762db7d59b47e92c0fbe.zip | |
Merge pull request #171 from clone2727/psx-stream-2
This is a manual merge based on clone2727's merge of his branch
with the sword1 subtitle changes on master.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions