]> 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, 28 Dec 2012 00:23:34 +0000 (19:23 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 28 Dec 2012 00:23:34 +0000 (19:23 -0500)
commit6fdab86857d5334d84a3720ec28d863d9da1544a
tree5b2a797241bc5443d32419830bc35f78f393d0a8
parent20bc1881082986bd5f35b6c7bfb608798d92ab5a
parent605ba4c6e90d84d0b84f7314fda01779391c25bf
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite