wm4 f7b2d644ef Merge branch 'master' into have_configure ... Conflicts: configure		2013-11-04 00:43:06 +01:00
..
lua
timeline	tl_matroska: initialize segment related arrays with 0	2013-11-01 17:35:38 +01:00
audio.c
command.c	configure: uniform the defines to #define HAVE_xxx (0|1)	2013-11-03 21:59:54 +01:00
command.h
configfiles.c	configure: uniform the defines to #define HAVE_xxx (0|1)	2013-11-03 21:59:54 +01:00
loadfile.c	Merge branch 'master' into have_configure	2013-11-04 00:43:06 +01:00
main.c	configure: uniform the defines to #define HAVE_xxx (0|1)	2013-11-03 21:59:54 +01:00
misc.c
mp_core.h	player: merge mp_osd.h into mp_core.h	2013-10-30 22:19:31 +01:00
mp_lua.c	configure: uniform the defines to #define HAVE_xxx (0|1)	2013-11-03 21:59:54 +01:00
mp_lua.h
osd.c	configure: uniform the defines to #define HAVE_xxx (0|1)	2013-11-03 21:59:54 +01:00
playloop.c	Merge branch 'master' into have_configure	2013-11-04 00:43:06 +01:00
screenshot.c	player: merge mp_osd.h into mp_core.h	2013-10-30 22:19:31 +01:00
screenshot.h
sub.c	configure: uniform the defines to #define HAVE_xxx (0|1)	2013-11-03 21:59:54 +01:00
video.c	configure: uniform the defines to #define HAVE_xxx (0|1)	2013-11-03 21:59:54 +01:00