]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorRudolf Polzer <divverent@alientrap.org>
Sun, 18 Jul 2010 15:08:16 +0000 (17:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 18 Jul 2010 15:08:16 +0000 (17:08 +0200)
commit2b464f6b459d824144bf232dc0a33e6fbd182126
treeaba368b163e0a7f99b7e6b7ceecf0177d3b44f70
parentce197770d0df6af609603340197206ddb4e71d75
parentbab4c298a34656172ee101847de7bd27c4403d2c
Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/fruitbalance