[Scummvm-cvs-logs] scummvm master -> b4af4dc8c201460699cce544e71dc2de252b821c

[urukgit]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f6c14408a3 AVALANCHE: Repair rest of the credits.
b4af4dc8c2 Merge branch 'master' of https://github.com/scummvm/scummvm


Commit: f6c14408a3fe486abcab170d34def40e6e521e40
    https://github.com/scummvm/scummvm/commit/f6c14408a3fe486abcab170d34def40e6e521e40
Author: uruk (koppirnyo at gmail.com)
Date: 2014-01-15T07:23:02-08:00

Commit Message:
AVALANCHE: Repair rest of the credits.

Changed paths:
    AUTHORS
    gui/credits.h



diff --git a/AUTHORS b/AUTHORS
index 947ce55..2800b62 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -62,7 +62,7 @@ ScummVM Team
        Oliver Kiehl                 - (retired)
        Ludvig Strigeus              - (retired)
 
-    AVALANCHE:
+    Avalanche:
        Peter Bozso
        Arnaud Boutonne
 
diff --git a/gui/credits.h b/gui/credits.h
index a14622e..bcace12 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -77,7 +77,7 @@ static const char *credits[] = {
 "C0""Ludvig Strigeus",
 "C2""(retired)",
 "",
-"C1""AVALANCHE",
+"C1""Avalanche",
 "A0""Peter Bozso",
 "C0""Peter Bozs\363",
 "A0""Arnaud Boutonne",


Commit: b4af4dc8c201460699cce544e71dc2de252b821c
    https://github.com/scummvm/scummvm/commit/b4af4dc8c201460699cce544e71dc2de252b821c
Author: uruk (koppirnyo at gmail.com)
Date: 2014-01-15T07:23:12-08:00

Commit Message:
Merge branch 'master' of https://github.com/scummvm/scummvm

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/modal.cpp
    engines/fullpipe/modal.h
    engines/wintermute/base/base_game.h
    engines/wintermute/base/saveload.cpp