Remove shadowed lifetime
Make JoystickGUID data pub
Fix shadowed lifetime in Timer
Use already present lifetime
Merge pull request #236 from bfops/master

Remove shadowed lifetime
Merge pull request #237 from jameson-ernst/master

Make JoystickGUID data pub
Bumped version number
Add semicolons to macro invocations

If a macro expands to items, braces or a semicolon is now needed
Remove librustrt, audio Task

Due to recent changes, librustrt and Task are now deprecated.
Calling Rust from C should now "just work".
Merge pull request #238 from Gekkio/macro-semicolons

Add semicolons to macro invocations
Merge remote-tracking branch 'upstream/master' into sys
Remove rust version output

The cli options have been renamed, and Travis also prints them
Merge pull request #243 from mvdnes/travis

Remove rust version output
Merge pull request #242 from nukep/master

Remove librustrt, audio Task
Bumped version number
Merge remote-tracking branch 'upstream/master' into sys

Conflicts:
	.travis.yml
	src/sdl2/lib.rs