Permalink
Browse files

Merge remote-tracking branch 'leereilly/meow'

  • Loading branch information...
2 parents f17d079 + 34c91df commit 9cbb44b1cccd8c2f71fb8e9acc46e66a94b0bfda @robn robn committed Aug 11, 2012
Showing with 4 additions and 0 deletions.
  1. +1 −0 AUTHORS.txt
  2. +3 −0 Changelog.txt
  3. BIN data/models/ships/default_ship_textures/station_splash.png
View
@@ -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
View
@@ -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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9cbb44b

Please sign in to comment.