diff options
author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-30 19:12:56 +0100 |
---|---|---|
committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-30 19:12:56 +0100 |
commit | 78737b78ac45d1213395819f3b85b4226088bd1a (patch) | |
tree | ad87d71fab0d9963bcb944666dc4ac7873569ec0 /reproduce/software/config/installation/TARGETS.mk | |
parent | b0993336112b244ea7e919d96ffdbaf167831b9d (diff) | |
parent | 743637f54b99310defc2cc5bdbc1bbd8d3e09e0f (diff) |
Imported some recent/parallel work, conflicts fixed
Especially because of the new convention regarding backslashes, there were
many conflicts that are now fixed. But none were substantial.
Diffstat (limited to 'reproduce/software/config/installation/TARGETS.mk')
-rw-r--r-- | reproduce/software/config/installation/TARGETS.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/reproduce/software/config/installation/TARGETS.mk b/reproduce/software/config/installation/TARGETS.mk index 4b1ff2e..b9157f1 100644 --- a/reproduce/software/config/installation/TARGETS.mk +++ b/reproduce/software/config/installation/TARGETS.mk @@ -1,6 +1,7 @@ # Necessary high-level software to build in this project. # # Copyright (C) 2018-2019 Mohammad Akhlaghi <mohammad@akhlaghi.org> +# Copyright (C) 2019 Raul Infante-Sainz <infantesainz@gmail.com> # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and |