]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Tue, 3 Apr 2012 15:49:48 +0000 (17:49 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 3 Apr 2012 15:49:48 +0000 (17:49 +0200)
commitc6466f683b8270a7a56305fbf0e8cc785df8356d
treefaa91c5737e5f44a2ecf121ad7179b38e89136a7
parent737ae27e0ab4fbbd4ab8be6b644cd2fc4a165e9c
parent951578abc632e86cc9b6d65f5c704c22ebe19313
Merge remote branch 'origin/master' into tzork/csqc-items
defaultXonotic.cfg
qcsrc/server/miscfunctions.qc
qcsrc/server/t_items.qc