]> 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: 765a47e f864a61)
Merge remote-tracking branch 'origin/divVerent/relics-media-v2'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 29 Apr 2011 21:42:36 +0000 (23:42 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 29 Apr 2011 21:42:36 +0000 (23:42 +0200)

Trivial merge