]> 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: 4cd679f da4435a)
Merge branch 'tzork/csqc-items' of git://de.git.xonotic.org/xonotic/xonotic-data...
authorJakob MG <jakob_mg@hotmail.com>
Wed, 28 Mar 2012 19:17:13 +0000 (21:17 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 28 Mar 2012 19:17:13 +0000 (21:17 +0200)
Conflicts:
qcsrc/server/t_items.qc


Trivial merge