[Scummvm-cvs-logs] scummvm master -> 25bf42516c16f7e5d65799902f997858ce6917f1

criezy criezy at scummvm.org
Mon Oct 8 21:37:36 CEST 2012


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:
53a53294af CREDITS: Mark Lothar Serra Mari as retired
25bf42516c CREDITS: Update the web credits path in the make rule


Commit: 53a53294af1eb5cb0bc70e5c4eb7964637827709
    https://github.com/scummvm/scummvm/commit/53a53294af1eb5cb0bc70e5c4eb7964637827709
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2012-10-08T12:34:05-07:00

Commit Message:
CREDITS: Mark Lothar Serra Mari as retired

Changed paths:
    AUTHORS
    devtools/credits.pl
    gui/credits.h



diff --git a/AUTHORS b/AUTHORS
index 3775f50..2ae5015 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -428,7 +428,7 @@ Other contributions
 
     German:
        Simon Sawatzki
-       Lothar Serra Mari
+       Lothar Serra Mari       - (retired)
 
     Hungarian:
        Alex Bevilacqua
diff --git a/devtools/credits.pl b/devtools/credits.pl
index 669b5e4..e04e35d 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -957,7 +957,7 @@ begin_credits("Credits");
 				end_section();
 				begin_section("German");
 					add_person("Simon Sawatzki", "SimSaw", "");
-					add_person("Lothar Serra Mari", "Lothar93", "");
+					add_person("Lothar Serra Mari", "Lothar93", "(retired)");
 				end_section();
 				begin_section("Hungarian");
 					add_person("Alex Bevilacqua", "", "");
diff --git a/gui/credits.h b/gui/credits.h
index 7164e3e..37c5a7b 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -493,6 +493,7 @@ static const char *credits[] = {
 "C1""German",
 "C0""Simon Sawatzki",
 "C0""Lothar Serra Mari",
+"C2""(retired)",
 "",
 "C1""Hungarian",
 "C0""Alex Bevilacqua",


Commit: 25bf42516c16f7e5d65799902f997858ce6917f1
    https://github.com/scummvm/scummvm/commit/25bf42516c16f7e5d65799902f997858ce6917f1
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2012-10-08T12:34:05-07:00

Commit Message:
CREDITS: Update the web credits path in the make rule

This is not guarantied to work but will work if both scummvm and
scummvm-web have been cloned in the same parent directory. The
old rules was always failing anyway, so this is an improvement. But
maybe we should comment that line?

Changed paths:
    devtools/module.mk



diff --git a/devtools/module.mk b/devtools/module.mk
index 95eca50..1d682cd 100644
--- a/devtools/module.mk
+++ b/devtools/module.mk
@@ -56,7 +56,7 @@ credits:
 	$(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS
 #	$(srcdir)/devtools/credits.pl --rtf > $(srcdir)/Credits.rtf
 	$(srcdir)/devtools/credits.pl --cpp > $(srcdir)/gui/credits.h
-	$(srcdir)/devtools/credits.pl --xml-website > $(srcdir)/../../web/trunk/data/credits.xml
+	$(srcdir)/devtools/credits.pl --xml-website > $(srcdir)/../scummvm-web/data/credits.xml
 #	$(srcdir)/devtools/credits.pl --xml-docbook > $(srcdir)/../../docs/trunk/docbook/credits.xml
 
 md5scumm: devtools/md5table$(EXEEXT)






More information about the Scummvm-git-logs mailing list