diff options
author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-03 15:24:08 +0000 |
---|---|---|
committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-03 15:24:08 +0000 |
commit | daeb41ba00427d28e22169381bc21b1ad784d087 (patch) | |
tree | 8a3267559a0f5c8dc63fae16ae2bc65d8ab6715e /reproduce/software/make/build-rules.mk | |
parent | 281ad23c2218560bcdfe3e76cf61f4901f76b257 (diff) | |
parent | b1bd282bc3bcd11573fc064edfbab1bd65564348 (diff) |
Imported recent updates in Maneage, minor conflicts fixed
There were only three very small conflicts that have been fixed.
Diffstat (limited to 'reproduce/software/make/build-rules.mk')
-rw-r--r-- | reproduce/software/make/build-rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/reproduce/software/make/build-rules.mk b/reproduce/software/make/build-rules.mk index d50c301..66c77bc 100644 --- a/reproduce/software/make/build-rules.mk +++ b/reproduce/software/make/build-rules.mk @@ -3,7 +3,7 @@ # imported into 'basic.mk' and 'high-level.mk'. They should be activated # with Make's 'Call' function. # -# Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> +# Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> # # This Makefile is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |