]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36188cb 8ff4427)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 18 Jan 2011 16:07:10 +0000 (17:07 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 18 Jan 2011 16:07:10 +0000 (17:07 +0100)

Trivial merge