]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notifications
authorSamual Lenks <samual@xonotic.org>
Sat, 20 Apr 2013 20:29:54 +0000 (16:29 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 20 Apr 2013 20:29:54 +0000 (16:29 -0400)
commitfab6469d9ba50b74d7b4cb05f44b4d2dd1971267
treec3bca48e8c362c2e0d984a512fc8516c820be6f9
parent106fb44461e3ffa8af705c5eebc4c88fdd19004a
parent949467085d71833e823493da5dd109422c44aafb
Merge remote-tracking branch 'origin/master' into samual/notifications