]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Wed, 18 Jan 2012 16:18:27 +0000 (11:18 -0500)
committerSamual <samual@xonotic.org>
Wed, 18 Jan 2012 16:18:27 +0000 (11:18 -0500)
commitb73f381ebb0443f7b59bdef2a0934dfdc900e0a0
tree91171ea77a47880c430f4dcb667a2c99e3251e69
parente3871c628b74dbe1cefe209d405eb9a815184094
parentbbc51e613e22eafdd915b549e0946fec7f09d1f7
Merge remote branch 'origin/master' into samual/menu_updates

Conflicts:
qcsrc/menu/xonotic/dialog_settings_network.c
defaultXonotic.cfg