/[CvsGraph]/cvsgraph/confl.l
ViewVC logotype

Diff of /cvsgraph/confl.l

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.2, Sat Feb 24 00:35:13 2001 UTC revision 1.3, Mon Feb 26 00:09:20 2001 UTC
# Line 77  Line 77 
77  margin_right            return tMARGIN_RIGHT;  margin_right            return tMARGIN_RIGHT;
78  image_type              return tIMAGE_TYPE;  image_type              return tIMAGE_TYPE;
79  image_quality           return tIMAGE_QUALITY;  image_quality           return tIMAGE_QUALITY;
80    map_name                return tMAP_NAME;
81    map_branch              return tMAP_BRANCH;
82    map_rev                 return tMAP_REV;
83    
84  jpeg                    yylval.num = IMAGE_JPEG; return tNUMBER;  jpeg                    yylval.num = IMAGE_JPEG; return tNUMBER;
85  png                     yylval.num = IMAGE_PNG; return tNUMBER;  png                     yylval.num = IMAGE_PNG; return tNUMBER;

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

  ViewVC Help
Powered by ViewVC 1.1.0 with CvsGraph 1.7.0