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

Resolved conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Deliverables/D4.1/Matita/Assembly.ma

    r279 r281  
    1818  | _ ⇒ [ ([[false;false;false;false;false;false;false;false]]) ]].
    1919
    20 
     20(*
    2121  | `ADDC (`A, `REG(r1,r2,r3)) ->
    2222     [mk_byte_from_bits ((false,false,true,true),(true,r1,r2,r3))]
     
    349349 
    350350 ].
    351 
     351*)
Note: See TracChangeset for help on using the changeset viewer.