/[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.5, Sun Mar 4 03:19:18 2001 UTC revision 1.6, Sat Mar 10 02:54:39 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    box_shadow              return tBOX_SHADOW;
55  color_bg                return tCOLOR_BG;  color_bg                return tCOLOR_BG;
56  cvsmodule               return tCVSMODULE;  cvsmodule               return tCVSMODULE;
57  cvsroot                 return tCVSROOT;  cvsroot                 return tCVSROOT;
58    date_format             return tDATE_FORMAT;
59  rev_color               return tREV_COLOR;  rev_color               return tREV_COLOR;
60    rev_bgcolor             return tREV_BGCOLOR;
61  rev_font                return tREV_FONT;  rev_font                return tREV_FONT;
62  rev_separator           return tREV_SEPARATOR;  rev_separator           return tREV_SEPARATOR;
63  rev_minline             return tREV_MINLINE;  rev_minline             return tREV_MINLINE;
# Line 63  Line 66 
66  rev_rspace              return tREV_RSPACE;  rev_rspace              return tREV_RSPACE;
67  rev_tspace              return tREV_TSPACE;  rev_tspace              return tREV_TSPACE;
68  rev_bspace              return tREV_BSPACE;  rev_bspace              return tREV_BSPACE;
69    rev_text                return tREV_TEXT;
70    rev_text_color          return tREV_TEXT_COLOR;
71    rev_text_font           return tREV_TEXT_FONT;
72  tag_color               return tTAG_COLOR;  tag_color               return tTAG_COLOR;
73  tag_font                return tTAG_FONT;  tag_font                return tTAG_FONT;
74  title                   return tTITLE;  title                   return tTITLE;
# Line 82  Line 88 
88  map_branch_alt          return tMAP_BRANCH_ALT;  map_branch_alt          return tMAP_BRANCH_ALT;
89  map_rev_href            return tMAP_REV_HREF;  map_rev_href            return tMAP_REV_HREF;
90  map_rev_alt             return tMAP_REV_ALT;  map_rev_alt             return tMAP_REV_ALT;
91    map_diff_href           return tMAP_DIFF_HREF;
92    map_diff_alt            return tMAP_DIFF_ALT;
93    
94  jpeg                    yylval.num = IMAGE_JPEG; return tNUMBER;  jpeg                    yylval.num = IMAGE_JPEG; return tNUMBER;
95  png                     yylval.num = IMAGE_PNG; return tNUMBER;  png                     yylval.num = IMAGE_PNG; return tNUMBER;

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

  ViewVC Help
Powered by ViewVC 1.1.0 with CvsGraph 1.7.0