]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/welcome_dialog
authorterencehill <piuntn@gmail.com>
Sat, 7 Mar 2015 18:43:33 +0000 (19:43 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 7 Mar 2015 18:43:33 +0000 (19:43 +0100)
commitad1ab138876ec34389508f189bcce3778fdd5c1a
treec8d31514b0ffe5806a33bee1e7a5a28cca9d0504
parentc3b41654fd21757a1d35e5b9c9fdece57511ba29
parentcbe6743ef05c17d65ab5e0733b69e1d1c350764c
Merge branch 'master' into terencehill/welcome_dialog
qcsrc/server/cl_client.qc