]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84647dd f826c3f)
Merge branch 'cbrutail/g-23_cant_take_it_anymore'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 30 Dec 2011 19:10:54 +0000 (20:10 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 30 Dec 2011 19:10:54 +0000 (20:10 +0100)

Trivial merge