/[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.7, Tue Dec 18 22:50:12 2001 UTC revision 1.8, Wed Dec 19 18:10:58 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;  branch_dupbox           return tBRANCH_DUPBOX;
55  box_shadow              return tBOX_SHADOW;  box_shadow              return tBOX_SHADOW;
56  upside_down             return tUPSIDE_DOWN;  upside_down             return tUPSIDE_DOWN;
57  strip_untagged          return tSTRIP_UNTAGGED;  strip_untagged          return tSTRIP_UNTAGGED;

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

  ViewVC Help
Powered by ViewVC 1.1.0 with CvsGraph 1.7.0