]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d81ab6 de52b3d)
Merge remote branch 'origin/divVerent/menu-imprOOvements' into fruitiex/newpanelhud_s...
authorRudolf Polzer <divverent@alientrap.org>
Thu, 17 Jun 2010 07:38:43 +0000 (09:38 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 17 Jun 2010 07:38:43 +0000 (09:38 +0200)
Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c

1  2 
qcsrc/menu/menu.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/menu/menu.qc
Simple merge