From e2b3adc04f73663659afad9a8b42b87a9778055d Mon Sep 17 00:00:00 2001 From: Inuyasha Date: Sun, 28 Feb 2016 18:21:37 -0800 Subject: [PATCH 1/2] Randy Heit -> Randi Heit --- src/f_finale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/f_finale.c b/src/f_finale.c index 466e208a5..9c3da5a68 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1068,7 +1068,7 @@ static const char *credits[] = { "iD Software", "Alex \"MistaED\" Fuller", "FreeDoom Project", // Used some of the mancubus and rocket launcher sprites for Brak - "Randy Heit ()", // For his MSPaint sprite that we nicked + "Randi Heit ()", // For their MSPaint sprite that we nicked "", "\1Produced By", "Sonic Team Junior", From c7b18207f5d338a6d3155844092dcb77de52a6e0 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Mon, 7 Mar 2016 16:06:04 -0500 Subject: [PATCH 2/2] travis: do not error on making cache folder, if it already restored from cache --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db44edb5d..c652584f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ addons: - p7zip-full before_script: - - mkdir $HOME/srb2_cache + - mkdir -p $HOME/srb2_cache - wget --verbose --server-response -c http://rosenthalcastle.org/srb2/SRB2-v2114-assets.7z -O $HOME/srb2_cache/SRB2-v2114-assets.7z - 7z x $HOME/srb2_cache/SRB2-v2114-assets.7z -oassets - mkdir build