Buildfix - copy/paste error.  Fixes #1148.
Merge pull request #1147 from unknownbrackets/dlist-parts

Displaylist rewrite partial changes
Read both pic0 and pic1 and draw them on the pause screen.
Buildfix for Qt. Gets Qt compiling again but not working yet. Hasn't compiled in a days now so I thought this was worthwhile.
Merge pull request #1149 from xsacha/master

Buildfix for Qt
Reset video pts when registering new streams.
win: Fix X360 button problems by skipping DInput if there's a 360 pad available.
fix XInput issue introduced in d82b09b087
Merge pull request #1150 from unknownbrackets/mpeg-fix

Reset video pts when registering new streams
Merge pull request #1152 from CrazyMax/win-input

fix XInput issue introduced in d82b09b087
HW T&L: Change unlitcolor initialization and cleanup fragmentshader formatting
Modifying shade mapping in HW and SW
Merge pull request #1154 from cinaera/lightning

Some changes on T&L (shade mapping)
Fix shader compilation error.
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