]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/terencehill/freezetag_health_effect'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 25 Jul 2011 16:51:54 +0000 (18:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 25 Jul 2011 16:51:54 +0000 (18:51 +0200)
commitd258838fcd6a9ad14f1a3f33eb743947befd8aaf
treeea7284b4757ddb31f18ccec1883a3c748cbe31e4
parentf12a9dbdca47a64ef3bd3c7fc0560e75cfef32b8
parent2e004af0c87e9291e03964ce8d19425b41fc7263
Merge remote-tracking branch 'origin/terencehill/freezetag_health_effect'