diff options
author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /devtools/create_toon | |
parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'devtools/create_toon')
-rw-r--r-- | devtools/create_toon/create_toon.cpp | 1 | ||||
-rw-r--r-- | devtools/create_toon/staticdata.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/devtools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp index d01102bb71..2cf8895d4b 100644 --- a/devtools/create_toon/create_toon.cpp +++ b/devtools/create_toon/create_toon.cpp @@ -160,4 +160,3 @@ void writeTextArray(FILE *outFile, const char *textArray[], int nbrText) { fwrite(padBuf, pad, 1, outFile); } } - diff --git a/devtools/create_toon/staticdata.h b/devtools/create_toon/staticdata.h index 2164512337..bc49c7adaf 100644 --- a/devtools/create_toon/staticdata.h +++ b/devtools/create_toon/staticdata.h @@ -318,4 +318,3 @@ const char *exitLine_RU = "Hope you enjoyed playing ToonStruck!!"; const char* exitLine_SP = "\255\255Esperamos que te diviertas jugando a ToonStruck!!"; #endif - |