]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc328f4 dbc8b4d)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into savagex/plat...
authorMaik Merten <maikmerten@googlemail.com>
Sun, 6 Feb 2011 14:31:39 +0000 (15:31 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Sun, 6 Feb 2011 14:31:39 +0000 (15:31 +0100)
1  2 
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/defs.qh
Simple merge