[vlc-devel] vlc: svn commit r23065 (jpsaman)

[Subversion daemon]

r23065 | jpsaman | 2007-11-14 16:17:57 +0100 (Wed, 14 Nov 2007) | 2 lines
Changed paths:
   M /trunk/include/vlc_configuration.h
   M /trunk/include/vlc_osd.h
   A /trunk/modules/misc/osd
   A /trunk/modules/misc/osd/Modules.am
   A /trunk/modules/misc/osd/osd_menu.c
   A /trunk/modules/misc/osd/osd_menu.h
   A /trunk/modules/misc/osd/parser.c
   M /trunk/src/osd/osd.c
   D /trunk/src/osd/osd_parser.c

Fix merge conflicts for src/osd/osd.c

 > http://trac.videolan.org/vlc/changeset/23065