]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/branding_lagclock'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:41:26 +0000 (21:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:41:26 +0000 (21:41 +0100)
commit551f9bb17fc380e5f067f655a973c12249a1fa0b
treec18fcaca28f1e4bf3c49eb4c0400649c08d95a6a
parentc6bfdc5e01bfdf352c43ec041657dad2e6cb6a3f
parent427c69eb9127a8e7c74418146a0da3b49b7da78e
Merge remote branch 'origin/fruitiex/branding_lagclock'