]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Sun, 30 Sep 2012 22:44:39 +0000 (18:44 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 30 Sep 2012 22:44:39 +0000 (18:44 -0400)
commitf9dc6d347452cfd2c7282072ab557c0da9ad1387
tree485ceb063e027f9bf4da243b10b95bdbdf5b57f7
parent136437da4a334451cf73e2b49d01555c3436ba83
parentc7cfa6d3491576206fcea9fcf8d86dfcc398b980
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite