]> 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: 619833f 0b8163e)
Merge remote branch 'refs/remotes/origin/mirceakitsune/forced_campaign_team'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 18 Sep 2010 10:40:56 +0000 (12:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 18 Sep 2010 10:40:56 +0000 (12:40 +0200)

Trivial merge