-SDL2 branch, updated vxproj's
-fix function collision