]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/musicvolume
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 9 Feb 2015 12:14:41 +0000 (13:14 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 9 Feb 2015 12:14:41 +0000 (13:14 +0100)
commite3bc409ab004dc509022e03b0a9c4c33556b64e8
treed5d1b8605e4901e4a4856d55189bcd8c06a36c35
parent7c3296dd294ef3c9633b5b7658396296d16e49b6
parentf2c50fe4e6218a0a1bb0ca078ee122c5ba6a238d
Merge branch 'master' into divVerent/musicvolume

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/bgmscript.qc
qcsrc/client/target_music.qc
qcsrc/common/util-pre.qh
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/bgmscript.qc
qcsrc/client/main.qc
qcsrc/client/target_music.qc
qcsrc/client/target_music.qh
qcsrc/common/util-pre.qh
qcsrc/menu/xonotic/dialog_settings_audio.qc