merge mainline into mips

2009-12-05 18:37:15 +01:00 · 2009-12-05 18:37:15 +01:00 · df2e3593f3
commit df2e3593f3
parent c4282e6cb3 b283f10857
12 changed files with 249 additions and 50 deletions
--- a/po/POTFILES
+++ b/po/POTFILES
@ -11,4 +11,5 @@ util/mkisofs/rock.c
 util/mkisofs/tree.c
 util/mkisofs/write.c

+normal/menu_entry.c
 normal/menu_text.c