diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-04-13 10:32:45 -0400 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-04-13 10:32:45 -0400 |
| commit | 74cfb3b59c714d2e0ef91d0ad3fe02bc096faf56 (patch) | |
| tree | 4e743664d4d139c35b4e656f267cb2a0d4799114 /src/library_sdl.js | |
| parent | 55d9a3bc975cb4e9fefb79aeca6d5b9ef5fcea1f (diff) | |
| parent | ffae4e81b6eec71922b662eea9a75f5693994cb2 (diff) | |
Merge remote-tracking branch 'upstream/incoming' into glmatrix
Conflicts:
src/library_gl.js
Diffstat (limited to 'src/library_sdl.js')
| -rw-r--r-- | src/library_sdl.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js index b607bdb3..11431e4e 100644 --- a/src/library_sdl.js +++ b/src/library_sdl.js @@ -702,6 +702,7 @@ mergeInto(LibraryManager.library, { surfData.ctx.drawImage(raw, 0, 0, raw.width, raw.height, 0, 0, raw.width, raw.height); return surf; }, + SDL_LoadBMP: 'IMG_Load', // SDL_Audio |