merge neutrino-apollo

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1adc51c0b8
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2013-01-16 11:31:47 +08:00
committed by [CST] Focus
parent 8c7ca18082
commit 5b9a1b8f52
4 changed files with 14 additions and 6 deletions

View File

@@ -1819,6 +1819,8 @@ typedef enum
LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART,
LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH,
LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART,
LOCALE_VIDEOMENU_ANALOG_AUTO,
LOCALE_VIDEOMENU_ANALOG_CVBS,
LOCALE_VIDEOMENU_ANALOG_HD_RGB,
LOCALE_VIDEOMENU_ANALOG_HD_YPRPB,
LOCALE_VIDEOMENU_ANALOG_SD_RGB,