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.
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
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