]> 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: f4b429d b2baadb)
Merge commit 'b2baadb34fab4fa42d1529f083eb72b4df105049'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Aug 2011 09:07:28 +0000 (11:07 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Aug 2011 09:07:28 +0000 (11:07 +0200)

Trivial merge