]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/wpeditior_command'
authorterencehill <piuntn@gmail.com>
Wed, 5 Sep 2018 19:26:57 +0000 (21:26 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 5 Sep 2018 19:26:57 +0000 (21:26 +0200)
1  2 
qcsrc/server/command/cmd.qc
qcsrc/server/impulse.qc

Simple merge
Simple merge