aboutsummaryrefslogtreecommitdiffstats
path: root/2014/Makefile
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@fripost.org>2019-05-07 22:40:32 +0200
committerGustav Eek <gustav.eek@fripost.org>2019-05-07 22:40:32 +0200
commit2e5ce0865dc0111623d72c44b2c93459cd7235b0 (patch)
treeec325315b86fc3b7e2484e286f6c255a32e82df9 /2014/Makefile
parentc3f5e8b11d786023065fb1f826b5b4040c358756 (diff)
parent17003dc40a21d4818fa65a15bc6bc2cc4159f9f7 (diff)
Merge branch 'intgr/2018-board' into 2018-08-27-board
Conflicts: 2018/Makefile preamble/preamble.tex
Diffstat (limited to '2014/Makefile')
0 files changed, 0 insertions, 0 deletions