]> 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>
Sat, 23 Feb 2013 23:35:04 +0000 (18:35 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 23 Feb 2013 23:35:04 +0000 (18:35 -0500)
commitd5bffe0a0226860335a3293f67ee43a09f8aad0a
tree74590cf69575320d6185511d89e1463de9d676bd
parent3cdb031ab11ac08956af8c16101119e47557c8e8
parentd27a9970837d9430120bc4dbe0fa873ecce87450
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite