Merged default into iOS-improvements

--HG-- branch : iOS-improvements
2015-04-06 15:26:37 -03:00 · 2015-04-06 15:26:37 -03:00 · 0bacddf42e
commit 0bacddf42e
parent 5ed59597bb a47b4d648c
150 changed files with 2690 additions and 1507 deletions
--- a/src/filesystem/nacl/SDL_sysfilesystem.c
+++ b/src/filesystem/nacl/SDL_sysfilesystem.c
@ -38,4 +38,5 @@ SDL_GetPrefPath(const char *org, const char *app)
    return NULL;
 }

-#endif /* __NACL__ */
+#endif /* SDL_FILESYSTEM_NACL */
+