]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/samual/intermission_fixes'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:33:02 +0000 (20:33 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:33:02 +0000 (20:33 +0200)
commit89c401d11e2ccee1a2164caf451fc3fbb27d429d
tree6239348e7e86729b9f84f6472fa13780276a58d3
parentbafee68748cce1220169e90aecbe4c34da988dad
parent0f5203ceed075bb2a648254f461902387588b172
Merge remote-tracking branch 'origin/samual/intermission_fixes'