]> 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: dd93cc7 2ab51d2)
Merge branch 'mirceakitsune/bugfixes'
authorRudolf Polzer <rpolzer@nb-04.(none)>
Thu, 25 Mar 2010 14:27:34 +0000 (15:27 +0100)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Thu, 25 Mar 2010 14:27:34 +0000 (15:27 +0100)

Trivial merge