]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/mirceakitsune/menu_bypass-picmip-check'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 8 Jan 2011 18:14:35 +0000 (19:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 8 Jan 2011 18:14:35 +0000 (19:14 +0100)
commit000100e5a06711f313310a4c35468e00c222eb4e
treeb2ae0cf01579ff9260be8291b7ce41f19d5ae588
parentda07fa37f1f1451a9da76b67e58fa6da3e789e7b
parentf129d276f5cfc1ce9300750592ba21273ee2dcc5
Merge remote branch 'origin/mirceakitsune/menu_bypass-picmip-check'

Conflicts:
qcsrc/menu/xonotic/slider_picmip.c
qcsrc/menu/xonotic/slider_picmip.c