]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da5dbb0 c414b7f)
Merge remote-tracking branch 'origin/samual/no_dead_airshots'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:49:46 +0000 (20:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:49:46 +0000 (20:49 +0200)

Trivial merge