]> 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>
Fri, 14 Dec 2012 10:19:48 +0000 (05:19 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 14 Dec 2012 10:19:48 +0000 (05:19 -0500)
commit55a58edd7283429a241ac242065b6d739f482aab
tree1fddf54517f3b17e9f8fdba631e5af9667bae97a
parentb26f1812d999d544c7762afb3479bf93c4309d6b
parent21669f743378b255e4f984222de65be549fda772
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite