diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-06 08:29:20 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-06 08:29:20 +0100 |
| commit | 1d5cf0f448b08d398f7edee472815844926e5de4 (patch) | |
| tree | e6af9a153673b827d3b22d3b64c8917b0b4103a7 /2014/Makefile | |
| parent | 2784a5345920940253a0501041a0b101df952a0b (diff) | |
| parent | a52f1ab9f85cf9583c0608708093db6d004ffee4 (diff) | |
Merge branch 'sep-8-2014', September 8, 2014 board meeting minutes
Conflicts appeard for '2014/Makefile' and
'preamble/preamble.tex'. Those were solved.
Diffstat (limited to '2014/Makefile')
| -rw-r--r-- | 2014/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/2014/Makefile b/2014/Makefile index e25e111..3fe21bb 100644 --- a/2014/Makefile +++ b/2014/Makefile @@ -7,7 +7,8 @@ MINUTES = \ 2014-04-21-board \ 2014-05-19-board \ 2014-05-19-board-excerpt \ -2014-06-16-board +2014-06-16-board \ +2014-09-08-board common-makefile = ../resources/Makefile-common |