diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
| commit | bec3b84f5ef798ab843028dd62018571a50330ed (patch) | |
| tree | a1805e73289111518e6343d255da1085736cb7f1 /libmenu | |
| parent | 9d27862072a233b423d4a81e966b1ba9627724a6 (diff) | |
| parent | 19c9e0aceb9620c862cab91b509df91931821d66 (diff) | |
| download | mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.bz2 mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.xz | |
Merge svn changes up to r26624
Conflicts:
Makefile
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu_cmdlist.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c index 2c2edf0970..5b450ef6f1 100644 --- a/libmenu/menu_cmdlist.c +++ b/libmenu/menu_cmdlist.c @@ -20,7 +20,6 @@ #include "libvo/font_load.h" #include "input/input.h" -#include "version.h" |