]> 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: 478f687 e2daf8d)
Merge branch 'master' into mirceakitsune/glowmod_weapons
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 10 May 2011 23:22:50 +0000 (02:22 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 10 May 2011 23:22:50 +0000 (02:22 +0300)

Trivial merge