Add Hybrid option for Texture Scaling
Merge pull request #1647 from raven02/patch-3

Add Hybrid option for Texture Scaling
Merge pull request #1648 from PeterTh/master

Scaler cleaning, speedup
Minor UI fix
Merge pull request #1649 from raven02/patch-4

Minor UI fix
Buildfix (all C++0x compilers). Drop the std::, do a static_cast for narrowing conversion as required by C++0x spec.
Buildfix. Was meant to be from unsigned int to u8.
Added texture deposterization option
Merge branch 'master' of https://github.com/hrydgard/ppsspp
Drop std:: from bind in deposterize, I want to avoid breaking builds again if at all possible