Skip to content

Commit

Permalink
Merge pull request #11 from djs55/release.0.7.0
Browse files Browse the repository at this point in the history
Release 0.7.0, update CHANGES
  • Loading branch information
djs55 committed Jan 30, 2014
2 parents c30bd1b + 0b81f7e commit 848cb8c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
3 changes: 2 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
trunk (unreleased)
0.7.0 (2014-01-30)
* vhd-tool: can create vhd-formatted output from 'hybrid' input
* update to ocaml-vhd 0.7.0
* switch build back to OASIS/ocamlbuild from obuild
* vhd-tool: info will not fail even if the parent is missing

0.6.5 (2013-11-21)
* vhd-tool: add machine-parsable progress reporting
Expand Down
6 changes: 3 additions & 3 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
OASISFormat: 0.3
Name: vhd-format
Version: 0.5.0
Name: vhd-tool
Version: 0.7.0
Synopsis: .vhd file manipulation
Authors: Jonathan Ludlam
Authors: Jonathan Ludlam and David Scott
License: LGPL-2.1 with OCaml linking exception
Plugins: META (0.3)
BuildTools: ocamlbuild
Expand Down
13 changes: 6 additions & 7 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.1 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 338031fbb104818b381342e8809a479c) *)
(* DO NOT EDIT (digest: 5b0d345d3405d1afd7371434398edf74) *)
(*
Regenerated by OASIS v0.4.1
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6551,8 +6551,8 @@ let setup_t =
findlib_version = None;
alpha_features = [];
beta_features = [];
name = "vhd-format";
version = "0.5.0";
name = "vhd-tool";
version = "0.7.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand All @@ -6564,7 +6564,7 @@ let setup_t =
license_file = None;
copyrights = [];
maintainers = [];
authors = ["Jonathan Ludlam"];
authors = ["Jonathan Ludlam and David Scott"];
homepage = None;
synopsis = ".vhd file manipulation";
description = None;
Expand Down Expand Up @@ -6712,15 +6712,14 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.1";
oasis_digest =
Some "\170\000\186\129\027\020\161\247'\240X\168\160\179\173*";
oasis_digest = Some "\199P8\185\235\191\183\238\191\to\213s\207+\226";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 6725 "setup.ml"
# 6724 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit 848cb8c

Please sign in to comment.