aboutsummaryrefslogtreecommitdiff
path: root/reproduce/analysis/make/prepare.mk
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2021-01-03 15:24:08 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2021-01-03 15:24:08 +0000
commitdaeb41ba00427d28e22169381bc21b1ad784d087 (patch)
tree8a3267559a0f5c8dc63fae16ae2bc65d8ab6715e /reproduce/analysis/make/prepare.mk
parent281ad23c2218560bcdfe3e76cf61f4901f76b257 (diff)
parentb1bd282bc3bcd11573fc064edfbab1bd65564348 (diff)
Imported recent updates in Maneage, minor conflicts fixed
There were only three very small conflicts that have been fixed.
Diffstat (limited to 'reproduce/analysis/make/prepare.mk')
-rw-r--r--reproduce/analysis/make/prepare.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/reproduce/analysis/make/prepare.mk b/reproduce/analysis/make/prepare.mk
index 0391956..995132c 100644
--- a/reproduce/analysis/make/prepare.mk
+++ b/reproduce/analysis/make/prepare.mk
@@ -1,6 +1,6 @@
# Basic preparations, called by `./project prepare'.
#
-# Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+# Copyright (C) 2019-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