[MPlayer-DOCS] r33558 - in trunk: DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 cfg-mplayer.h gui/cfg.c gui/cfg.h

[ib]

Author: ib
Date: Sun Jun  5 12:14:26 2011
New Revision: 33558

Log:
Add option '-gui-include'.

This is the GUI counterpart to MPlayer's option '-include'.

Modified:
   trunk/DOCS/man/en/mplayer.1

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/de/mplayer.1
   trunk/cfg-mplayer.h
   trunk/gui/cfg.c
   trunk/gui/cfg.h

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Sat Jun  4 12:27:45 2011	(r33557)
+++ trunk/DOCS/man/en/mplayer.1	Sun Jun  5 12:14:26 2011	(r33558)
@@ -755,7 +755,7 @@ Override the standard search path and us
 instead of the builtin codecs.conf.
 .
 .TP
-.B \-include <configuration file>
+.B \-include <configuration file> (also see \-gui-include)
 Specify configuration file to be parsed after the default ones.
 .
 .TP
@@ -1033,6 +1033,10 @@ Only works as the first argument on the 
 Does not work as a config-file option.
 .
 .TP
+.B \-gui-include <GUI configuration file> (also see \-include) (GUI only)
+Specify a GUI configuration file to be parsed after the default gui.conf.
+.
+.TP
 .B \-h, \-help, \-\-help
 Show short summary of options.
 .