]> 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 | compact (merge: e97a2b0 43014c8)
Merge remote branch 'refs/remotes/origin/mirceakitsune/ghost_items_team_fix'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:36:07 +0000 (23:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:36:07 +0000 (23:36 +0200)

Trivial merge