]> 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: 43e505d 0315d93)
Merge remote branch 'origin/morphed/flag'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 14:14:17 +0000 (15:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 14:14:17 +0000 (15:14 +0100)

Trivial merge