]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/mutators_dialog_cleanup
authorterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:55:32 +0000 (23:55 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:55:32 +0000 (23:55 +0200)
commit834876e6b179cf33ce95102ba25faf754e9a8773
tree0ec107bdffc49c08eaf5ac27a028becd3fb70abe
parent142e56c24ca153c940a09572d396b520b331dc26
parenta4ccbd75da12da9090f3d25ad4dc9edd0efe3060
Merge branch 'master' into terencehill/mutators_dialog_cleanup

Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c