]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commit988616c6116192918e86ce93b13ce3469e55f532
treefe57681a89350add14aa53d5d15b672607b65016tree | snapshot
parent4cd679f6f0dd2bc1c0f1dbd92f11f017e383d86bcommit | diff
parentda4435ace052085eb1a4109992637aa189af7432commit | diff
Merge branch 'tzork/csqc-items' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into tzork/csqc-items

Conflicts:
qcsrc/server/t_items.qc