Merge remote-tracking branch 'leereilly/meow'

pioneerspacesim · Aug 11, 2012 · 9cbb44b · 9cbb44b
2 parents f17d079 + 34c91df
commit 9cbb44b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -23,6 +23,7 @@ The Pioneer team, past and present, as at 10 August 2012 (alpha 25):
   John Jordan
   Kimmo Kotajärvi
   Konrad Mruk
+  Lee Reilly
   Lars Westerhoff
   Leonardo Manna
   Marcel Tulloh

diff --git a/Changelog.txt b/Changelog.txt
@@ -4,6 +4,9 @@ Alpha 26
      * Fix atmospheric pressure calculations (#1431, #1395)
      * Fix lighting glitches in systems with multiple stars (#1430, #1411)
 
+   * Minor changes and tweaks
+     * Updated station splash advert (#1429)
+
 Alpha 25
 
    * New features

diff --git a/data/models/ships/default_ship_textures/station_splash.png b/data/models/ships/default_ship_textures/station_splash.png