]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/mutators_dialog_cleanup
authorterencehill <piuntn@gmail.com>
Thu, 10 May 2012 16:11:09 +0000 (18:11 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 10 May 2012 16:11:09 +0000 (18:11 +0200)
commitcc8895c290e5b20ea8f3d47dd6110f2f0fc7b3ac
tree89635da179803fe89f7bd5369c46a9cb01baeb36
parent50967b631057ea1677416437a83c281eb324cdbd
parent481509839fb065e8854b533da2093424cd058e7e
Merge branch 'master' into terencehill/mutators_dialog_cleanup