(PSP) add VFPU flag to main thread attributes
(Android) GPL waiver - bump up year
Update views.h

changed to correct path...
"frontend/info/core_info.h"
Merge pull request #600 from URBANsUNITED/patch-1

Update views.h
(Android) Bump up versioncode
(VideoCore EGL) Fix build
(PSP) add allegrex VFPU optimized s16 <-> float conversions.
(PSP) add an audio resampler using VFPU/allegrex assembly
Merge pull request #606 from aliaspider/master

(PSP) VFPU optimized audio resampler and s16 <-> float conversions
Should fix build on Pi.
Fix compile issue in VC context.
vg methods require the vg be passed as first object; allows this file to compile on Debian Wheezy amd64
libavutil-dev version 1.0.8 support, requires we conditionalize the avutil/channel_layout.h include
Don't have to include channel layout header.
Merge branch 'master' of git://github.com/adicarlo/RetroArch

Conflicts:
	record/ffemu.c
(Menu) Cleanup
(D3D) TODO - quick hack to get D3D driver to at least work for games -
WM_DESTROY needs to be properly reimplemented
(D3D) Don't add Direct3D to window title
frontend: add debug for MODE_CLEAR_INPUT