From: Lucca Hirschi Date: Wed, 4 Jul 2012 12:48:49 +0000 (+0200) Subject: Merge branch 'lucca-master' into HEAD X-Git-Tag: Core~7 X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=commitdiff_plain;h=445457b2dc5ca11cb3d305c346fe7937f29ba2a9;hp=881ebcb1df7335560c8715ec673980158f6ee585 Merge branch 'lucca-master' into HEAD Conflicts: src/run.ml --- diff --git a/src/run.ml b/src/run.ml index de2ba81..444cce7 100644 --- a/src/run.ml +++ b/src/run.ml @@ -11,8 +11,6 @@ (* *) (***********************************************************************) -INCLUDE "utils.ml" - module Node = struct type t = int @@ -50,4 +48,3 @@ let print fmt run = print_map run in Format.fprintf fmt "@[##### RUN #####@, %a@ @]@." print_box run -