]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/samual/menu_organization' into samual/combined_u...
authorSamual Lenks <samual@xonotic.org>
Sun, 18 Aug 2013 19:31:58 +0000 (15:31 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 18 Aug 2013 19:31:58 +0000 (15:31 -0400)
commit747695127cde71a71f63e0d364ff6e9756660369
tree2165c2c0ac33c7b554c1d1c436b97143193b1bea
parent4573326ce5d9a936956984ccaa5d7fe1b41f0013
parent26d2be10dfede237aa61fe5966905508f4c0f99c
Merge remote-tracking branch 'origin/samual/menu_organization' into samual/combined_updates

Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer.c
qcsrc/menu/classes.c
qcsrc/menu/xonotic/dialog_multiplayer.c
qcsrc/menu/xonotic/mainwindow.c