Changeset e5aa0d1 in rtems


Ignore:
Timestamp:
Jul 18, 2008, 7:38:55 AM (11 years ago)
Author:
Thomas Doerfler <Thomas.Doerfler@…>
Branches:
4.10, 4.11, 4.9, master
Children:
59be902
Parents:
d4502b4
Message:

resolved conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/gen83xx/ChangeLog

    rd4502b4 re5aa0d1  
    1 <<<<<<< ChangeLog
    2 2008-05-15      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
     12008-07-18      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
    32
    43        * network/network.c:
    54        mpc8249eamds uses gmii mode
    65
    7 =======
    862008-07-17      Ralf Corsépius <ralf.corsepius@rtems.org>
    97
    108        * configure.ac: Remove RTEMS_AMPOLISH3.
    119
    12 >>>>>>> 1.31
    13102008-07-14      Sebastian Huber <sebastian.huber@embedded-brains.de>
    1411
Note: See TracChangeset for help on using the changeset viewer.