Matthew Hoops 00279659b2 Merge remote branch 'upstream/master' into pegasus
Conflicts:
	video/qt_decoder.cpp
2011-12-12 15:25:28 -05:00
..
2011-07-19 14:12:07 -04:00
2011-08-07 13:53:33 +02:00
2011-07-19 10:31:03 -04:00
2011-07-19 10:31:03 -04:00
2011-07-18 10:28:10 -04:00
2011-05-25 13:23:03 +02:00
2011-07-19 14:12:07 -04:00
2011-08-06 15:52:36 +01:00
2011-12-04 15:54:32 +01:00
2011-06-20 00:59:48 +02:00
2011-06-20 00:59:48 +02:00