]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 22 Dec 2011 17:56:31 +0000 (12:56 -0500)
committerSamual <samual@xonotic.org>
Thu, 22 Dec 2011 17:56:31 +0000 (12:56 -0500)
commit1f1c714c231334ca941e029e7ab2094fff25b476
treec525a63d09d5cb94afb4af5c05d9ef73ab75c6c5
parentde8e5ce38b8a446cedfdef846d0cd5d8a328a061
parent2421325930a9c1fa610f6233430745fd352e202a
Merge remote branch 'origin/master' into samual/updatecommands
qcsrc/client/progs.src
qcsrc/server/progs.src