wm4
97ac824124
Merge remote-tracking branch 'origin/master'
...
Conflicts:
bstr.c
bstr.h
libvo/cocoa_common.m
libvo/gl_common.c
libvo/video_out.c
mplayer.c
screenshot.c
sub/subassconvert.c
Merge of cocoa_common.m done by pigoz.
Picking my version of screenshot.c. The fix in commit aadf1002f8 will
be redone in a follow-up commit, as the original commit causes too many
conflicts with the work done locally in this branch, and other work in
progress.
2012-04-29 10:01:28 +02:00
..
2011-05-06 18:33:16 +03:00
2010-11-14 13:11:20 +02:00
2012-02-01 22:46:27 +02:00
2011-05-02 00:46:48 +03:00
2011-05-06 18:33:16 +03:00
2012-02-01 22:46:27 +02:00
2010-11-08 18:05:12 +02:00
2012-04-06 17:45:56 +03:00
2011-02-15 18:35:34 +02:00
2010-11-08 18:05:12 +02:00
2012-03-09 20:48:54 +02:00
2011-05-06 18:33:16 +03:00
2011-12-22 01:27:45 +02:00
2010-12-16 05:16:50 +02:00
2011-12-11 07:48:26 +02:00
2011-04-13 03:17:05 +03:00
2012-02-01 22:46:27 +02:00
2011-07-10 11:30:06 +03:00
2012-04-28 03:25:04 +03:00
2012-04-06 17:45:56 +03:00
2011-07-06 08:56:37 +03:00
2010-11-08 18:05:12 +02:00
2012-02-01 22:46:27 +02:00
2011-07-06 13:01:07 +03:00
2011-04-20 04:22:42 +03:00
2011-07-06 13:01:07 +03:00
2011-04-20 04:22:42 +03:00
2012-04-18 01:27:55 +03:00
2012-03-16 19:14:44 +01:00
2010-11-08 18:05:12 +02:00
2010-11-08 18:05:12 +02:00
2012-04-11 03:56:30 +03:00
2010-11-08 18:05:12 +02:00
2011-05-02 00:46:03 +03:00
2012-04-06 17:45:56 +03:00
2012-04-01 17:35:01 +03:00
2012-02-01 22:46:27 +02:00
2011-07-06 09:30:04 +03:00
2011-05-06 18:33:16 +03:00
2011-07-06 13:01:07 +03:00
2011-07-06 13:01:08 +03:00
2011-07-06 13:01:08 +03:00
2011-02-15 18:47:55 +02:00
2010-12-16 05:19:17 +02:00
2011-06-29 09:26:00 +03:00
2012-02-01 22:46:27 +02:00
2011-06-29 09:26:00 +03:00
2012-02-01 22:46:27 +02:00