Merge branch 'beagle-cupcake' of git@gitorious.org:0xdroid/external_libsdl-12 into... beagle-cupcake beagle-donut
authorJim Huang <jserv@0xlab.org>
Tue, 13 Oct 2009 10:36:13 +0000 (18:36 +0800)
committerJim Huang <jserv@0xlab.org>
Tue, 13 Oct 2009 10:36:13 +0000 (18:36 +0800)
commit7f0216440b9e623bc336b720d3eece42ea2152f2
treef68e94731a0a5d1cf8c41d2ddcba0b5d2d851a28
parent24df344aeb4cf79a443f0b8f9d0ae6afd34b8e61
parentc5776de450f8ff073c6c4c416884b839b88f129a
Merge branch 'beagle-cupcake' of git@gitorious.org:0xdroid/external_libsdl-12 into beagle-cupcake

Conflicts:
include/SDL_stdinc.h
src/video/SDL_sysvideo.h
src/video/SDL_video.c
include/SDL_stdinc.h