Browse Source

Correct version number, changed by merging with dev*conflict*

Leo 10 years ago
parent
commit
f174a29540
4 changed files with 4 additions and 5 deletions
  1. 0 0
      VERSION
  2. 0 0
      _oasis
  3. 4 5
      setup.ml
  4. 0 0
      src/oclaunch.ml

+ 0 - 0
VERSION


+ 0 - 0
_oasis


+ 4 - 5
setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 
 (* OASIS_START *)
 (* OASIS_START *)
-(* DO NOT EDIT (digest: f08446edf2e3b491355f76e0fc2fb353) *)
+(* DO NOT EDIT (digest: a6d875824b2b3643cd7b6ee0805653c9) *)
 (*
 (*
    Regenerated by OASIS v0.4.5
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6673,7 +6673,7 @@ let setup_t =
           alpha_features = ["stdfiles_markdown"; "compiled_setup_ml"];
           alpha_features = ["stdfiles_markdown"; "compiled_setup_ml"];
           beta_features = [];
           beta_features = [];
           name = "OcLaunch";
           name = "OcLaunch";
-          version = "0.2.2-rc1";
+          version = "0.2.2";
           license =
           license =
             OASISLicense.DEP5License
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
               (OASISLicense.DEP5Unit
@@ -6777,8 +6777,7 @@ let setup_t =
        };
        };
      oasis_fn = Some "_oasis";
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
      oasis_version = "0.4.5";
-     oasis_digest =
-       Some "\213\002\026\240\142!\131\164/\176u\007\235\131\004\188";
+     oasis_digest = Some "\223\199\020P\007\005v]\132ep\239\218N\217\164";
      oasis_exec = None;
      oasis_exec = None;
      oasis_setup_args = [];
      oasis_setup_args = [];
      setup_update = false
      setup_update = false
@@ -6786,6 +6785,6 @@ let setup_t =
 
 
 let setup () = BaseSetup.setup setup_t;;
 let setup () = BaseSetup.setup setup_t;;
 
 
-# 6790 "setup.ml"
+# 6789 "setup.ml"
 (* OASIS_STOP *)
 (* OASIS_STOP *)
 let () = setup ();;
 let () = setup ();;

+ 0 - 0
src/oclaunch.ml