Changeset 5f80527 in mainline


Ignore:
Timestamp:
2011-03-21T18:28:04Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
50114ef
Parents:
fbefd0e (diff), 31b568e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    rfbefd0e r5f80527  
    99_link.ld
    1010./*.iso
     11
     12./tools/__pycache__/
    1113
    1214./Makefile.common
     
    139141.cproject
    140142.project
     143.settings
     144.pydevproject
     145
Note: See TracChangeset for help on using the changeset viewer.