]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e3a7be af818d8)
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 patch | diff1 | diff2 | blob | history
qcsrc/common/util.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/util.qc
Simple merge
diff --cc qcsrc/common/util.qh
Simple merge