diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:25:10 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:25:10 +0100 |
| commit | 4b3b4a69975aa2c8fb50173b76b0c7797e4ca5fb (patch) | |
| tree | 40d3cf5343b10ddb4a4015bd719862827d9a17dd /2014/Makefile | |
| parent | 705d0da59b9a2f364e36c3f06a5da38efa402d6b (diff) | |
| parent | 9388183566e3eb4e12290535d04ea93c4f1850a9 (diff) | |
Merge branch 'june-16' into 'may-19'
Those branches contains minutes from May 19 and June 16,
2014. Conflict for '2014/Makefile' was solved.
Diffstat (limited to '2014/Makefile')
| -rw-r--r-- | 2014/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/2014/Makefile b/2014/Makefile index 0ebd26b..06e24d0 100644 --- a/2014/Makefile +++ b/2014/Makefile @@ -1,6 +1,10 @@ # Makefile for minutes of 2014 -MINUTES = 2014-02-11-board 2014-05-19-board 2014-05-19-board-excerpt +MINUTES = \ +2014-02-11-board \ +2014-05-19-board \ +2014-05-19-board-excerpt \ +2014-06-16-board common-makefile = ../resources/Makefile-common |