Ignore:
Timestamp:
Nov 24, 2010, 6:29:12 PM (9 years ago)
Author:
mulligan
Message:

Resolved conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Deliverables/D4.1/Matita/depends

    r271 r281  
    1 Arithmetic.ma BitVector.ma Bool.ma Connectives.ma Exponential.ma List.ma Nat.ma Plogic/equality.ma Universes.ma
    21Status.ma Arithmetic.ma BitVectorTrie.ma
    32Exponential.ma Connectives.ma Nat.ma Plogic/equality.ma
     3Arithmetic.ma BitVector.ma Bool.ma Connectives.ma Exponential.ma List.ma Nat.ma Plogic/equality.ma Universes.ma
    44BitVectorTrie.ma BitVector.ma Bool.ma Maybe.ma
    55Cartesian.ma Universes.ma
     6Universes.ma
    67Maybe.ma Bool.ma Plogic/equality.ma Universes.ma
    78Either.ma Bool.ma Maybe.ma Universes.ma
    8 Universes.ma
    99ASM.ma BitVectorTrie.ma Either.ma String.ma
     10Char.ma Universes.ma
    1011Vector.ma Cartesian.ma List.ma Maybe.ma Nat.ma Plogic/equality.ma Util.ma
    11 Char.ma Universes.ma
    1212Connectives.ma Plogic/equality.ma
    1313Bool.ma Universes.ma
     
    1515List.ma Bool.ma Nat.ma Plogic/equality.ma Universes.ma Util.ma
    1616Util.ma Nat.ma
     17String.ma Char.ma List.ma
    1718BitVector.ma Bool.ma List.ma Nat.ma Universes.ma Vector.ma
    1819Compare.ma Universes.ma
    19 String.ma Char.ma List.ma
    2020Plogic/equality.ma Universes.ma
    2121Nat.ma Bool.ma Cartesian.ma Connectives.ma
Note: See TracChangeset for help on using the changeset viewer.