Bastien Bouclet b77469a4d3 Merge remote-tracking branch 'origin/master' into sprint
Conflicts:
	backends/events/sdl/sdl-events.cpp
	backends/events/sdl/sdl-events.h
	video/bink_decoder.cpp
2012-01-07 08:43:26 +01:00
..
2011-07-20 08:02:02 +02:00
2012-01-06 22:56:21 +01:00
2011-05-18 23:33:39 +02:00