COIN-OR::LEMON - Graph Library

Ignore:
Timestamp:
01/27/04 22:36:17 (17 years ago)
Author:
Mihaly Barasz
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@54
Message:

Jacint conflict-janak kijavitasa

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/work/marci_graph_concept.txt

    r30 r40  
    2727trivialis node iterator, csak cimezni lehet vele, pl property vectort
    2828
    29 <<<<<<< marci_graph_concept.txt
    30 class each_node_iterator
     29class each_node_iterator;
    3130node iterator a graf pontjainak bejarasara, node_iterator-ra konvertalhato
    32 =======
    33 class each_node_iterator;
    34 node iterator a graf pontjainak bejarasara, node_iterator-a konvertalhato
    35 >>>>>>> 1.3
    3631
    3732class edge_iterator;
     
    4136edge iterator a graf osszes elenek bejarasara
    4237
    43 <<<<<<< marci_graph_concept.txt
    44 class out_edge_iterator
     38class out_edge_iterator;
    4539edge iterator 1 pont ki eleinek bejarasara, edge_iterator-ra konvertalhato
    46 =======
    47 class out_edge_iterator;
    48 edge iterator 1 pont ki eleinek bejarasara, edge_iterator-a konvertalhato
    49 >>>>>>> 1.3
    50 
    51 <<<<<<< marci_graph_concept.txt
    52 class in_edge_iterator
     40
     41class in_edge_iterator;
    5342edge iterator 1 pont be eleinek bejarasara, edge_iterator-ra konvertalhato
    54 =======
    55 class in_edge_iterator;
    56 edge iterator 1 pont be eleinek bejarasara, edge_iterator-a konvertalhato
    57 >>>>>>> 1.3
    5843     
    59 <<<<<<< marci_graph_concept.txt
    60 class sym_edge_iterator
     44class sym_edge_iterator;
    6145edge iterator 1 pont be es ki eleinek bejarasara, edge_iterator-ra
    6246konvertalhato
    63 =======
    64 class sym_edge_iterator;
    65 edge iterator 1 pont be es ki eleinek bejarasara, edge_iterator-a konvertalhato
    66 >>>>>>> 1.3
    6747
    6848default constructor:
Note: See TracChangeset for help on using the changeset viewer.