]> git.sesse.net Git - vlc/commit
projects / vlc / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6f7b6bf) | patch
Fix merge conflicts for src/osd/osd.c
authorJean-Paul Saman <jpsaman@videolan.org>
Wed, 14 Nov 2007 15:17:57 +0000 (15:17 +0000)
committerJean-Paul Saman <jpsaman@videolan.org>
Wed, 14 Nov 2007 15:17:57 +0000 (15:17 +0000)
commit4ff5e969b5892a9f56ee1b5d77d86bdc7202250f
tree02743f033d22e4c7d6d58a18c6a753f478cd9d17tree | snapshot
parent6f7b6bf6fd00917d97fb297db4c9f53bd44fe2bbcommit | diff
Fix merge conflicts for src/osd/osd.c
include/vlc_configuration.h diff | blob | history
include/vlc_osd.h diff | blob | history
modules/misc/osd/Modules.am [new file with mode: 0644] blob
modules/misc/osd/osd_menu.c [new file with mode: 0644] blob
modules/misc/osd/osd_menu.h [new file with mode: 0644] blob
modules/misc/osd/parser.c [new file with mode: 0644] blob
src/osd/osd.c diff | blob | history
src/osd/osd_parser.c [deleted file] blob | history
Unnamed repository; edit this file 'description' to name the repository.