/[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.6, Sat Mar 10 02:54:39 2001 UTC revision 1.7, Tue Dec 18 22:50:12 2001 UTC
# Line 51  Line 51 
51  branch_tspace           return tBRANCH_TSPACE;  branch_tspace           return tBRANCH_TSPACE;
52  branch_connect          return tBRANCH_CONNECT;  branch_connect          return tBRANCH_CONNECT;
53  branch_margin           return tBRANCH_MARGIN;  branch_margin           return tBRANCH_MARGIN;
54    branch_mirror           return tBRANCH_MIRROR;
55  box_shadow              return tBOX_SHADOW;  box_shadow              return tBOX_SHADOW;
56    upside_down             return tUPSIDE_DOWN;
57    strip_untagged          return tSTRIP_UNTAGGED;
58  color_bg                return tCOLOR_BG;  color_bg                return tCOLOR_BG;
59  cvsmodule               return tCVSMODULE;  cvsmodule               return tCVSMODULE;
60  cvsroot                 return tCVSROOT;  cvsroot                 return tCVSROOT;
# Line 91  Line 94 
94  map_diff_href           return tMAP_DIFF_HREF;  map_diff_href           return tMAP_DIFF_HREF;
95  map_diff_alt            return tMAP_DIFF_ALT;  map_diff_alt            return tMAP_DIFF_ALT;
96    
97    
98  jpeg                    yylval.num = IMAGE_JPEG; return tNUMBER;  jpeg                    yylval.num = IMAGE_JPEG; return tNUMBER;
99  png                     yylval.num = IMAGE_PNG; return tNUMBER;  png                     yylval.num = IMAGE_PNG; return tNUMBER;
100  gif                     yylval.num = IMAGE_GIF; return tNUMBER;  gif                     yylval.num = IMAGE_GIF; return tNUMBER;

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

  ViewVC Help
Powered by ViewVC 1.1.0 with CvsGraph 1.7.0