Skip to content
  • trevor's avatar
    Squashed commit of the following: · 86bf4164
    trevor authored
    commit 6549c3e569d0e0c3714814860201924432da2435
    Author: Trevor Elliott <trevor@galois.com>
    Date:   Sun Sep 8 16:43:42 2013 -0700
    
        Document `data kind` syntax
    
    commit 81c6d7b884e819cf0b0569cef23b67bb5aff8944
    Merge: 6c3f34c c798a8c6
    Author: Trevor Elliott <trevor@galois.com>
    Date:   Sun Sep 8 11:40:47 2013 -0700
    
        Merge remote-tracking branch 'head/master' into data-kind-syntax-v2
    
    commit 6c3f34c80bd8b17920a956e194ec29d1affbd776
    Author: Trevor Elliott <awesomelyawesome@gmail.com>
    Date:   Wed Aug 28 02:21:07 2013 -0400
    
        Merge with the roles changes
    
          There a bunch of spots where the roles haven't been properly integrated with,
        so this patch should get some review.
    
    commit 6bb530f50f655e74fb4e337311699eee46b519b7
    Merge: 7d27880 4b5238a4
    Author: Trevor Elliott <awesomelyawesome@gmail.com>
    Date:   Tue Aug 27 02:35:55 2013 -0400
    
        Merge remote-tracking branch 'head/master' into data-kind-syntax-v2
    
        Conflicts:
        	compiler/basicTypes/DataCon.lhs
        	com...
    86bf4164