]> 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: 668bb83 61e0672)
Merge remote branch 'refs/remotes/origin/mirceakitsune/item_norespawn'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:26:54 +0000 (23:26 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:26:54 +0000 (23:26 +0200)

Trivial merge