diff options
| author | Peter Kohaut | 2017-03-20 00:30:41 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2017-03-20 00:30:41 +0100 |
| commit | 02185fbcf52a406fb6a381ccfdfdd46077c24127 (patch) | |
| tree | c29431a4344664c27862d43967d1c9e9f3627ea6 /devtools | |
| parent | 25e5143f99dab91d53eb52de703ef1b4c9ee2656 (diff) | |
| parent | 89d5eeaa5819c10266160fd1bf12f88f6e073a12 (diff) | |
| download | scummvm-rg350-02185fbcf52a406fb6a381ccfdfdd46077c24127.tar.gz scummvm-rg350-02185fbcf52a406fb6a381ccfdfdd46077c24127.tar.bz2 scummvm-rg350-02185fbcf52a406fb6a381ccfdfdd46077c24127.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/credits.pl | 5 | ||||
| -rwxr-xr-x | devtools/encode-macbinary.sh | 18 |
2 files changed, 20 insertions, 3 deletions
diff --git a/devtools/credits.pl b/devtools/credits.pl index ffefc98a0f..744a13aa47 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -877,6 +877,11 @@ begin_credits("Credits"); add_person("Joost Peters", "joostp", ""); end_section(); + begin_section("PlayStation Vita"); + add_person("", "Cpasjuste", ""); + add_person("", "rsn8887", ""); + end_section(); + begin_section("SDL (Win/Linux/OS X/etc.)"); add_person("Max Horn", "Fingolfin", "(retired)"); add_person("Eugene Sandulenko", "sev", "Asm routines, GFX layers"); diff --git a/devtools/encode-macbinary.sh b/devtools/encode-macbinary.sh index 6635f7fcda..235dd860a4 100755 --- a/devtools/encode-macbinary.sh +++ b/devtools/encode-macbinary.sh @@ -5,7 +5,19 @@ for i in * do - macbinary encode "$i" - touch -r "$i" "$i.bin" - mv "$i.bin" "$i" + if test -d "$i" ; then + cd "$i" + bash $0 "$1/$i" + cd .. + else + echo -n $1/$i ; echo -ne "... \r" + macbinary encode "$i" + touch -r "$i" "$i.bin" + mv "$i.bin" "$i" + fi done + +# on the top level we want to print a new line +if test -z $1 ; then + echo +fi |