]> 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: 175676a 5a682c6)
Merge branch 'morphed/hpitems' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authorMorphed <Morphed@o2.pl>
Wed, 30 Mar 2011 21:38:48 +0000 (23:38 +0200)
committerMorphed <Morphed@o2.pl>
Wed, 30 Mar 2011 21:38:48 +0000 (23:38 +0200)

Trivial merge