c8273a1 merge branches/record-disambiguation

Merged and Committed by Jacques Garrigue 11 years ago
    merge branches/record-disambiguation
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13112 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
    
        
file modified
+1 -1
file modified
+15 -0
file modified
+5 -0
file modified
+134 -56
file modified
+17 -10
file modified
+28 -4
file modified
+3 -1
file modified
+2 -2
file modified
+34 -0
file modified
+4 -0
file modified
+381 -74
file modified
+3 -0
file modified
+19 -2
file modified
+15 -0
file modified
+20 -2
file modified
+2 -0