aboutsummaryrefslogtreecommitdiffstats
path: root/2014/2014-03-29-annual.tex
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@fripost.org>2019-08-11 21:09:23 +0200
committerGustav Eek <gustav.eek@fripost.org>2019-08-11 21:11:59 +0200
commit3c7dd72d877d67e3156c2a0522db92e46ed07c8f (patch)
tree079ff1808f767f4f872f0d385854a6cbd7104298 /2014/2014-03-29-annual.tex
parent77130f908f3d6a7e086f425bacbf1b47c9d36b5a (diff)
parentba6f821c2ae1ec2842218092ddba1f02aa0324d4 (diff)
Merge branch 'master' into 2019-05-27-board
Compilation conflicts solved regarding * Major Makfile remastering (*Makefile* only) * Attendants acronyms in preamble (dropped from 2019-05-27-board.tex)
Diffstat (limited to '2014/2014-03-29-annual.tex')
0 files changed, 0 insertions, 0 deletions