diff options
author | Andre Heider | 2010-09-05 23:12:03 +0000 |
---|---|---|
committer | Andre Heider | 2010-09-05 23:12:03 +0000 |
commit | a7ff124dfd30032bfaa1897e13d1848c62b30013 (patch) | |
tree | caae3a25403cf2a3e6a9922608043615a9b71a22 /engines/kyra/text_lok.cpp | |
parent | cd5e62bbe8234233679861f7421b850ff832efd5 (diff) | |
parent | f69bfaf355b2544bf8ca8cc6cf3209773b8ad005 (diff) | |
download | scummvm-rg350-a7ff124dfd30032bfaa1897e13d1848c62b30013.tar.gz scummvm-rg350-a7ff124dfd30032bfaa1897e13d1848c62b30013.tar.bz2 scummvm-rg350-a7ff124dfd30032bfaa1897e13d1848c62b30013.zip |
MERGE: Merge trunk to branch again to test r52579.
svn-id: r52580
Diffstat (limited to 'engines/kyra/text_lok.cpp')
0 files changed, 0 insertions, 0 deletions