]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Fri, 14 Jun 2013 00:43:43 +0000 (20:43 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 14 Jun 2013 00:43:43 +0000 (20:43 -0400)
commit33095a161b78b2c486fda10f5941d891ce54ad57
treea28314559542fb61f5f41f8a6f77f8c35961422c
parent3d3676f188c6815a9cb9d624f1b29e018d05327a
parentdf3016ae09ceb806fa1a87d1422f7ed0bfb98331
Merge remote-tracking branch 'origin/master' into samual/weapons
qcsrc/client/progs.src
qcsrc/menu/progs.src
qcsrc/server/progs.src