]> 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>
Thu, 31 Jan 2013 08:37:18 +0000 (03:37 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 31 Jan 2013 08:37:18 +0000 (03:37 -0500)
commit6ec50d2b480d38a5b9e46618ca957aa46d1f7d1b
tree43e1c98ff18ac420c7e3e2892a3b7000641464d1
parentaa6619d96b7b66a9ed9033ad374e3d12bf713553
parent9c135628c252c5655c452c7143e14461391c7799
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite