OS X: Fix build on Mac OS X 10.6 (from vit9696.)
OS X: Look for assets/ in prog dir (from vit9696.)
OS X: Workaround weird problem in OS X 10.6 with defines.

Apparently !defined(__MAC_10_6) doesn't work?
Fix in-game flickering in Dissidia Final Fantasy
Add option to toggle mipmapping , default false
Merge pull request #1161 from raven02/patch-2

Fix in-game flickering in Dissidia Final Fantasy
Merge pull request #1163 from unknownbrackets/mac10.6

Mac OS X 10.6 support
Merge pull request #1162 from raven02/patch-3

Add option to toggle mipmapping for Android, default false
Don't delay results when dispatch is disabled.

Wait won't work so the CoreTiming event will just cause havoc.
Merge pull request #1165 from unknownbrackets/hle-delay

Don't delay results when dispatch is disabled
Clean up restricted ISO reading.
Merge pull request #1166 from unknownbrackets/perf-fix

Clean up restricted ISO reading
Android buildfix.
Set min/mag filter to GL_LINEAR when disable mipmapping
Merge pull request #1167 from raven02/patch-4

Set min/mag filter to GL_LINEAR when disable mipmapping
Merge remote-tracking branch 'upstream/master' into fps2