Merge remote branch 'origin/fruitiex/effectinfo_nerf'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)
commit8874199c028a79c4877fb406e3d27aa7870a8edc
tree612f6471fd0fa3779c7a29f7f37a073742160f23
parentfd5886b4935bc9bcec2c48615209621d3b2fc8dc
parent0aae37994f415ff90f8760ba4a553258975280b1
Merge remote branch 'origin/fruitiex/effectinfo_nerf'