diff options
| author | Willem Jan Palenstijn | 2013-09-21 20:05:47 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-21 20:05:47 +0200 |
| commit | 4b5ca10f68effb88e297d72f6ea366d760acf9ed (patch) | |
| tree | 4a410f6c32f452afaef54c43119730cf6b53c60b /COPYING.LGPL | |
| parent | a6d902df2827b91dc641b6f51c0a070b70a09179 (diff) | |
| parent | 97b255ab33fa5fcd4507573e77cd42a8406e1b55 (diff) | |
| download | scummvm-rg350-4b5ca10f68effb88e297d72f6ea366d760acf9ed.tar.gz scummvm-rg350-4b5ca10f68effb88e297d72f6ea366d760acf9ed.tar.bz2 scummvm-rg350-4b5ca10f68effb88e297d72f6ea366d760acf9ed.zip | |
Merge branch 'master' into sci_midiparser
Conflicts:
engines/sci/sound/midiparser_sci.cpp
Diffstat (limited to 'COPYING.LGPL')
0 files changed, 0 insertions, 0 deletions