]> de.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: ccff2fe d7cca4c)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into savagex/plat...
authorMaik Merten <maikmerten@googlemail.com>
Tue, 25 Jan 2011 18:24:57 +0000 (19:24 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Tue, 25 Jan 2011 18:24:57 +0000 (19:24 +0100)
1  2 
qcsrc/server/g_subs.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_subs.qc
Simple merge