]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into samual/combined_updates
authornyov <nyov@nexnode.net>
Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)
committernyov <nyov@nexnode.net>
Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)
1  2 
qcsrc/common/util.qc
qcsrc/common/util.qh

Simple merge
Simple merge