]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 5151763 dcf8a85)
Merge branch 'master' into terencehill/player_model_zoom terencehill/player_model_zoom
authorterencehill <piuntn@gmail.com>
Mon, 19 Jan 2015 13:16:10 +0000 (14:16 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 19 Jan 2015 13:17:23 +0000 (14:17 +0100)
commit5e6047290477aea42e6ca133f0d418d3a1c1cd22
tree459b610756bc9b513f524b8796f736b979c3f5e9tree | snapshot
parent5151763690a1ac5088339b03055e7ba80dc1eafbcommit | diff
parentdcf8a85693db60468fde21e1eaa64043576edb0dcommit | diff
Merge branch 'master' into terencehill/player_model_zoom

Conflicts:
qcsrc/menu/item/image.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/dialog_multiplayer_profile.c | diff2 | blob | history
qcsrc/menu/xonotic/playermodel.c diff1 | diff2 | blob | history