diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
| commit | e30aa60a06817ed67c14a80430a7275defc41e76 (patch) | |
| tree | b4bb512416a40578db1f32eb3a7836ddb6f8582d /driver/Configuration.ml | |
| parent | aa780c7145a418b4a7264e828258034fc4629313 (diff) | |
| parent | 2f31c1867b75040067a1ef74ae32f197e8d296c1 (diff) | |
| download | compcert-e30aa60a06817ed67c14a80430a7275defc41e76.tar.gz compcert-e30aa60a06817ed67c14a80430a7275defc41e76.zip | |
Merge branch 'master' into json_export
Conflicts:
driver/Driver.ml
Diffstat (limited to 'driver/Configuration.ml')
| -rw-r--r-- | driver/Configuration.ml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/driver/Configuration.ml b/driver/Configuration.ml index 70131fc6..64f24820 100644 --- a/driver/Configuration.ml +++ b/driver/Configuration.ml @@ -104,7 +104,6 @@ let advanced_debug = | "false" -> false | v -> bad_config "advanced_debug" [v] -let version = get_config_string "version" type struct_passing_style = | SP_ref_callee (* by reference, callee takes copy *) |