diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-14 21:52:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-14 21:52:51 +0000 |
| commit | 00e6751183c1e854ea3eba746b101449b32201a4 (patch) | |
| tree | 3494085d6728e086582f30c8a68846d81840303d /xorg-server/hw/xwin/winprefsyacc.y | |
| parent | ac637a8cd15f3977f44b701c7ac71a561763c1d8 (diff) | |
| parent | 8d38172d866775594af3185ae3fbd8d750677650 (diff) | |
| download | vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.gz vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.bz2 vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xwin/winprefsyacc.y')
| -rw-r--r-- | xorg-server/hw/xwin/winprefsyacc.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winprefsyacc.y b/xorg-server/hw/xwin/winprefsyacc.y index 653a4ab25..b9e961622 100644 --- a/xorg-server/hw/xwin/winprefsyacc.y +++ b/xorg-server/hw/xwin/winprefsyacc.y @@ -118,7 +118,7 @@ extern int yylex(void); %token ATEND
%token EXEC
%token ALWAYSONTOP
-%token DEBUGTOK
+%token DEBUGOUTPUT "DEBUG"
%token RELOAD
%token TRAYICON
%token FORCEEXIT
@@ -246,7 +246,7 @@ forceexit: FORCEEXIT NEWLINE { pref.fForceExit = TRUE; } silentexit: SILENTEXIT NEWLINE { pref.fSilentExit = TRUE; }
;
-debug: DEBUGTOK STRING NEWLINE { winDebug("LoadPreferences: %s\n", $2); free($2); }
+debug: DEBUGOUTPUT STRING NEWLINE { winDebug("LoadPreferences: %s\n", $2); free($2); }
;
|