]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from: 000100e)
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)
Conflicts:
qcsrc/menu/xonotic/slider_picmip.c


No differences found