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 /tex | |
| 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 'tex')
| -rw-r--r-- | tex/README.md | 2 | ||||
| -rw-r--r-- | tex/src/preamble-maneage.tex | 2 | ||||
| -rw-r--r-- | tex/src/preamble-pgfplots.tex | 2 | ||||
| -rw-r--r-- | tex/src/preamble-project.tex | 2 | ||||
| -rw-r--r-- | tex/src/references.tex | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tex/README.md b/tex/README.md index 12a19fc..0319585 100644 --- a/tex/README.md +++ b/tex/README.md @@ -1,7 +1,7 @@ Directory containing LaTeX-related files ---------------------------------------- -Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>\ +Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>\ See the end of the file for license conditions. This directory contains directories to various components the LaTeX part of diff --git a/tex/src/preamble-maneage.tex b/tex/src/preamble-maneage.tex index 81d8535..2f2b393 100644 --- a/tex/src/preamble-maneage.tex +++ b/tex/src/preamble-maneage.tex @@ -1,6 +1,6 @@ %% Preamble for Maneage-related features. % -%% Copyright (C) 2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2020-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> % %% This LaTeX file is part of Maneage. Maneage is free software: you can %% redistribute it and/or modify it under the terms of the GNU General diff --git a/tex/src/preamble-pgfplots.tex b/tex/src/preamble-pgfplots.tex index 0c0485c..188b5a9 100644 --- a/tex/src/preamble-pgfplots.tex +++ b/tex/src/preamble-pgfplots.tex @@ -40,7 +40,7 @@ %% hasn't changed since the last build. TiKZ/PGFPlots won't rebuild the %% plot. % -%% Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> % %% This LaTeX file is part of Maneage. Maneage is free software: you can %% redistribute it and/or modify it under the terms of the GNU General diff --git a/tex/src/preamble-project.tex b/tex/src/preamble-project.tex index f360ce9..7351d83 100644 --- a/tex/src/preamble-project.tex +++ b/tex/src/preamble-project.tex @@ -4,7 +4,7 @@ %% LaTeX usages. However, if any are not needed in your work, please feel %% free to remove them. % -%% Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> +%% Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> %% Copyright (C) YYYY Your Name <your@email.address> % %% This file is free software: you can redistribute it and/or modify it diff --git a/tex/src/references.tex b/tex/src/references.tex index c8b7e0d..e2f5c89 100644 --- a/tex/src/references.tex +++ b/tex/src/references.tex @@ -3,7 +3,7 @@ % %% [[[BibTeX 0.99d complains with the at-character, even when its in a %% comment line! So ::at:: is used instead in the email address]]]. -%% Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad::at::akhlaghi.org> +%% Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad::at::akhlaghi.org> % %% Copying and distribution of this file, with or without modification, %% are permitted in any medium without royalty provided the copyright |