Mac framework support
Merge pull request #30 from pcwalton/mac-framework

Mac framework support
Merge pull request #29 from dpc/upstream

Implement `img::load_img` (`IMG_Load` from `SDL_image`).
Add support for the SDL mixer.

This is the only way to get audio support in Rust at the moment; the
low-level SDL_audio stuff wants to run a callback on a separate thread and that
will segfault at the moment. brson's stuff should eventually fix this, but for
now the SDL mixer must be used.
Made SDL image optional
Merge branch 'mixer' of git://github.com/pcwalton/rust-sdl into pcwalton-mixer

Conflicts:
	Makefile.in
	ll.rs
	sdl.rc
Added a basic readme file.
Corrected some styling issues in README markdown, and clarified flags
usage
Add mixer::allocate_channels, mixer::query, and mixer::playing
Merge pull request #32 from pcwalton/mixer

Add mixer::allocate_channels, mixer::query, and mixer::playing
Update impl syntax for language changes
Merge pull request #34 from pcwalton/impl-syntax

Update impl syntax for language changes
Revamp the bindings, bringing them closer to current idioms and simplifying things
Moved to Fail! over Die! as the syntax has changed back in Incoming
Merge branch 'revamp' of git://github.com/z0w0/rust-sdl into z0w0-revamp

Conflicts:
	audio.rs
	conversions.rs
	keyboard.rs
	sdl.rs
	src/mixer.rs
	test.rs
	video.rs
Updated version in pkg, updated readme to reflect the lack of tests
Update pkg.rs
Merge pull request #36 from luqmana/patch-1

Update pkg.rs
Tiny typo fix :)
Merge pull request #37 from nightpool/patch-1

Tiny typo fix :)