Changeset 397


Ignore:
Timestamp:
May 28, 2013, 11:10:26 AM (12 years ago)
Author:
alain
Message:

Fixing a wrong merge during commit.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/platforms/tsar_generic_xbar/top.cpp

    r396 r397  
    569569            {
    570570#endif
    571             bool is_io_cluster = (cluster(x,y) == cluster_io_id);
    572571
    573572            std::ostringstream sc;
    … …  
    579578            (
    580579                sc.str().c_str(),
    581 <<<<<<< .mine
    582580                NB_PROCS_MAX,
    583581                NB_TTY_CHANNELS, 
Note: See TracChangeset for help on using the changeset viewer.