Merge branch 'charEncoding'

.gitignore

@@ -2,7 +2,9 @@
 .o
 .cm[oxi]
 *~
+#*
 _*//META
+_build/
 /_build/_digests
 /_build/_log
 /_build/myocamlbuild

myocamlbuild.ml

@@ -1,7 +1,7 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: e274da4e4ccb7035073d59e1b2a8619e) *)
+(* DO NOT EDIT (digest: c0882bbd6145b5b2f2424d81953181ee) *)
 module OASISGettext = struct
-# 21 "/Users/yoriyuki/Factory/ocaml-4.00.1/oasis-0.3.0/src/oasis/OASISGettext.ml"
+(* # 21 "src/oasis/OASISGettext.ml" *)
 
   let ns_ str =
     str
@@ -24,7 +24,7 @@ module OASISGettext = struct
 end
 
 module OASISExpr = struct
-# 21 "/Users/yoriyuki/Factory/ocaml-4.00.1/oasis-0.3.0/src/oasis/OASISExpr.ml"
+(* # 21 "src/oasis/OASISExpr.ml" *)
 
 
 
@@ -116,7 +116,7 @@ end
 
 # 117 "myocamlbuild.ml"
 module BaseEnvLight = struct
-# 21 "/Users/yoriyuki/Factory/ocaml-4.00.1/oasis-0.3.0/src/base/BaseEnvLight.ml"
+(* # 21 "src/base/BaseEnvLight.ml" *)
 
   module MapString = Map.Make(String)
 
@@ -214,7 +214,7 @@ end
 
 # 215 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
-# 21 "/Users/yoriyuki/Factory/ocaml-4.00.1/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
+(* # 21 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
   (** OCamlbuild extension, copied from 
     * http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -323,7 +323,7 @@ module MyOCamlbuildFindlib = struct
 end
 
 module MyOCamlbuildBase = struct
-# 21 "/Users/yoriyuki/Factory/ocaml-4.00.1/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+(* # 21 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
 
   (** Base functions for writing myocamlbuild.ml
       @author Sylvain Le Gall
@@ -339,7 +339,7 @@ module MyOCamlbuildBase = struct
   type name = string 
   type tag = string 
 
-# 56 "/Users/yoriyuki/Factory/ocaml-4.00.1/oasis-0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+(* # 56 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
 
   type t =
       {