Ignore:
Timestamp:
Aug 11, 2009, 4:13:09 PM (15 years ago)
Author:
Christoph Mayer
Message:

merge noch nicht fertig

File:
1 edited

Legend:

Unmodified
Added
Removed

  • source/ariba/SideportListener.cpp

    r5870 r5871  
    8888        bool relay = false;
    8989
    90         bool relay = false;
    91 
    9290        BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
    9391
    … …  
    102100        }
    103101
    104 <<<<<<< .working
    105         return relay;
    106 =======
    107102        return relay;
    108103        */
    109104
    110105        return false;
    111 >>>>>>> .merge-rechts.r5869
    112106}
    113107
Note: See TracChangeset for help on using the changeset viewer.