]> 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: 62d48fb c00d521)
Merge remote branch 'origin/fruitiex/no_kill_notify'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 14 Dec 2010 06:54:47 +0000 (07:54 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 14 Dec 2010 06:54:47 +0000 (07:54 +0100)

Trivial merge