]> 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: 693187a 2daa43b)
Merge branch 'div0/mutatorsystem'
authorRudolf Polzer <rpolzer@nb-04.(none)>
Mon, 22 Mar 2010 15:48:38 +0000 (16:48 +0100)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Mon, 22 Mar 2010 15:48:38 +0000 (16:48 +0100)

Trivial merge