Merge branch 'sdl2cs-system-ram' of git://github.com/babelshift/SDL2-CS into sdl2-hg

This commit is contained in:
Ethan Lee 2013-10-22 20:26:23 -04:00
commit 8facd9f0b0

View file

@ -3795,6 +3795,7 @@ namespace SDL2
}
#endregion
#region SDL_keycode.h
public const int SDLK_SCANCODE_MASK = (1 << 30);
@ -5311,5 +5312,16 @@ namespace SDL2
);
#endregion
#region SDL_cpuinfo.h
/// <summary>
/// This function returns the amount of RAM configured in the system, in MB.
/// </summary>
/// <returns></returns>
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern int SDL_GetSystemRAM();
#endregion
}
}